Merge branch 'spp' into 'master'

Spp

See merge request !35

src/api/apiList.js

@@ -10,8 +10,8 @@ const baseUrl = '/api'
 // todo: url
 // const httpUrl = 'https://repairtest.zeruiedu.com' // 测试接口
 const httpUrl = 'https://repair.zeruiedu.com' // 正式接口
-const h5Url = 'http://localhost:8080' // 测试h5线上地址
-// const h5Url = 'http://repair.h5.zeruiedu.com' // 测试h5线上地址
+// const h5Url = 'http://localhost:8080' // 测试h5线上地址
+const h5Url = 'http://repair.h5.zeruiedu.com' // 测试h5线上地址
 window.localStorage.setItem('httpUrl', httpUrl)
 window.localStorage.setItem('h5Url', h5Url)
 // const httpUrl = 'https://fenghexm.xueyoubangedu.com' // 正式接口
@@ -47,6 +47,7 @@ export default {
     REPAIR_APPRAISAL: baseUrl + '/worker/repair/appraisal', // 查看评论
     USER_EDIT: baseUrl + '/worker/user/edit', // 修改手机号
     WORKER_BACK: baseUrl + '/worker/repair/worker/back', // 工人端退回报修单
+    ORDER_INFO: baseUrl + '/worker/repair/order/info', // 工人端工单详情页
 
     // 管理员端
     GET_WORKER: baseUrl + '/worker/get/worker', // 查看评论

src/assets/styles/tabbar/admin_index.scss

@@ -216,7 +216,7 @@
 
 .one {
     color: #727272;
-    margin-bottom: 0.3rem;
+    // margin-bottom: 0.3rem;
 }
 
 .one-item {

src/router/index.js

@@ -61,6 +61,24 @@ const routes = [{
     },
     component: () => import('@/views/my/charge.vue')
 },
+{
+    path: '/order_detail',
+    name: 'order_detail',
+    meta: {
+        title: '工单详情',
+        hideBack: true
+    },
+    component: () => import('@/views/my/order_detail.vue')
+},
+{
+    path: '/admin_detail',
+    name: 'admin_detail',
+    meta: {
+        title: '审核员工单详情',
+        hideBack: true
+    },
+    component: () => import('@/views/my/admin_detail.vue')
+},
 {
     path: '/lookEvaluate',
     name: 'lookEvaluate',
@@ -97,15 +115,15 @@ router.beforeEach((to, from, next) => {
         return true
     }
     if (to.query.token && to.query.status) {
-        console.log('ok-------0', status)
+        // console.log('ok-------0', status)
         token = to.query.token
         status = to.query.status
-        console.log('1111', to.query)
+        console.log('1111', to)
         if (to.query.role != 0) {
             role = to.query.role
             window.localStorage.setItem('role', role)
         }
-        console.log('router里的', window.localStorage.getItem('role'));
+        // console.log('router里的', window.localStorage.getItem('role'));
 
         // console.log(token)
         // console.log(status)
@@ -113,13 +131,15 @@ router.beforeEach((to, from, next) => {
         window.localStorage.setItem('status', status)
     }
     if (token && status === '200') {
+        // const is_detail = to.query.is_info ? 1 : 0
+        // console.log('is_detail', is_detail)
         console.log('ok-------1', 200)
-        if (role == 2 || role == 4) { // 2审核员身份  4超管身份
-            setTimeout(() => {
+        if ((role == 2 || role == 4) && to.path =='/') { // 2审核员身份  4超管身份
+            // setTimeout(() => {
                 next({
                     path: '/admin_home'
                 })
-            }, 50)
+            // }, 50)
         }
         next()
     } else if (token && status === '100') {

src/views/my/admin_detail.vue

+<template>
+  <div>审核员详情页</div>
+</template>
+
+<script>
+export default {
+
+}
+</script>
+
+<style>
+
+</style>
\ No newline at end of file

src/views/my/charge.vue

@@ -164,9 +164,7 @@ export default {
     },
     methods: {
         goBack(){
-            this.$router.push({
-                path: '/'
-            })
+           this.$router.go(-1);
         },
         callPhone(order){
             let phoneNumber = order.telephone

src/views/tabbar/admin_home.vue

@@ -128,6 +128,55 @@
               <img :src="child.url" alt />
             </div>
           </div>
+          <div class="material" v-if="item.no_pay_order">
+            <div class="item-title bz-title">待支付耗材</div>
+            <div class="no-pay ma-item flex-h flex-hb" v-for="(child, index) in item.no_pay_order.goods" :key="index">
+              <div class="one one1 text-line-one">{{child.parent_detail.goods_name}}</div>
+              <div class="one one2 flex-h">
+                <div class="_one text-line-one">{{child.good_detail.goods_name}}</div>
+                <div class="_two text-line-one">*{{child.number}}</div>
+              </div>
+              <div class="one one3">￥{{child.price}}</div>
+            </div>
+            <div class="item_line"></div>
+          </div>
+          <div class="material" v-if="item.pay_order != ''">
+            <div class="item-title bz-title">已支付耗材</div>
+            <div v-for="(parent, index) in item.pay_order" :key="index">
+              <div
+                class="ma-item flex-h flex-hb"
+                v-for="(child, index) in parent.goods"
+                :key="index"
+              >
+                <div class="one one1 text-line-one">{{child.parent_detail.goods_name}}</div>
+                <!-- <div class="one">{{child.good_detail.goods_name}}*{{child.number}}</div> -->
+                <div class="one one2 flex-h">
+                  <div class="_one text-line-one">{{child.good_detail.goods_name}}</div>
+                  <div class="_two text-line-one">*{{child.number}}</div>
+                </div>
+                <div class="one one3">￥{{child.price}}</div>
+              </div>
+            </div>
+            <div class="item_line"></div>
+          </div>
+          <!-- <div class="line"></div> -->
+          <div class="material" v-if="item.free_material_order">
+            <div class="item-title bz-title">备注耗材</div>
+            <div
+              class="ma-item flex-h flex-hb"
+              v-for="(child, index) in item.free_material_order.goods"
+              :key="index"
+            >
+              <div class="one one1 text-line-one">免费</div>
+              <div class="one one2 flex-h">
+                <div class="_one text-line-one" @click="showAll(item,$event)">{{child.goods_name}}</div>
+                <div class="_two text-line-one">*{{child.number}}</div>
+              </div>
+              <!-- <div class="one one2 text-line-one">{{child.goods_name}}*{{child.number}}</div> -->
+              <div class="one one3 text-line-one">￥0</div>
+            </div>
+            <div class="item_line"></div>
+          </div>
           <div class="item flex-h flex-start" v-if="item.orderlog_transfer">
             <div class="item-title">转单备注:</div>
             <div class="item-desc">{{item.orderlog_transfer.remark}}</div>