Merge branch 'master' of http://122.51.230.86:3000/dianliang/lanan-repair-app

components/orderCard.vue

@@ -89,7 +89,7 @@ export default {
     },
     gotoDetail() {
       uni.navigateTo({
-        url: '/pages-order/orderDetail/orderDetail?id=' + this.order.id
+        url: '/pages-order/orderDetail/orderDetail?id=' + this.order.id + '&isDetail=' + '1'
       })
     },
     /**

pages-order/orderDetail/orderDetail.vue

@@ -112,7 +112,7 @@
         <view v-if="selectedProj && selectedProj.length > 0" class="card cardInfo projCard">
           <view class="projTitle">维修项目</view>
           <view class="projList">
-            <template v-if="role == 'admin'">
+            <template v-if="isDetail == '1'">
               <view v-for="item in selectedProj" :key="item.id" class="projItem">
                 <view class="projTop">
                   <text class="projName">{{ item.projName }}</text>
@@ -228,7 +228,8 @@ export default {
   },
   data() {
     return {
-      role: 'admin',
+      //是否详情页(0否1是)
+      isDetail:'1',
       // role: 'yewu',
       orderId: '',
       orderInfo: {},
@@ -306,8 +307,13 @@ export default {
     if (data.id) {
       this.orderId = data.id
     }
+    if (data.isDetail){
+      this.isDetail = data.isDetail
+    }
   },
   methods: {
+    
+
     editPeople(type, proj) {
       bus.$off('choosePeople')
       bus.$on('choosePeople', (data) => {