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

pages-order/orderDetail/orderDetail.vue

@@ -114,18 +114,17 @@
             </template>
           </view>
         </view>
-        <view v-if="ticketInfo.items && ticketInfo.items.length > 0" class="card cardInfo projCard">
+        <view v-if="ticketInfo.projects && ticketInfo.projects.length > 0" class="card cardInfo projCard">
           <view class="projTitle">维修项目</view>
           <view class="projList">
             <template>
-              <view v-for="item in ticketInfo.items" :key="item.id" class="projEditItem">
+              <view v-for="item in ticketInfo.projects" :key="item.id" class="projEditItem">
 
                 <view class="projEditLine1">
                   <text>{{ item.itemName }}</text>
                   <text v-if="loginUser.roleCodes.includes('weixiu') || loginUser.roleCodes.includes('service_advisor')||loginUser.roleCodes.includes('general_inspection')"  class="projAmount">￥{{ item.itemMoney }}</text>
                 </view>
                 <view class="projBaseInfo" v-if="loginUser.roleCodes.includes('weixiu') || loginUser.roleCodes.includes('service_advisor')||loginUser.roleCodes.includes('general_inspection')" >
-                  <view>规格：{{item.project.spec}}</view>
                   <view>售价：{{ item.itemPrice }}</view>
                   <view>数量：{{ item.itemCount }}</view>
                   <view>单位：{{ item.itemUnit}}</view>
@@ -174,7 +173,11 @@
           </view>
         </view>
         <view v-if="ticketInfo.wares && ticketInfo.wares.length > 0" class="card cardInfo projCard">
-          <view class="projTitle">维修配件</view>
+          <view class="projTitle">维修配件 </view>
+          <view class="infoItem" style="flex: 1">
+            <view class="label"><text>是否开放给客户</text><switch :checked="ticketInfo.partShow == '1'" style="transform:scale(0.7)" @change="toPartShow" /></view>
+          </view>
+
           <view class="projList">
             <template>
               <view v-for="item in ticketInfo.wares" :key="item.id" class="projEditItem">
@@ -213,7 +216,7 @@
                       {{ item.remark }}
                     </view>
                     <view class="projImg">
-                      <image v-for="(img, imgIndex) in item.itemList" :key="imgIndex" :src="imgUrlPrex + item.image"
+                      <image v-for="(img, imgIndex) in item.itemList" :key="imgIndex" :src="imgUrlPrex + img.image"
                              class="projImgItem"></image>
                     </view>
                     <view class="projSend">
@@ -448,6 +451,24 @@ export default {
     fabClick() {
 
     },
+    /**
+     * 是否开放给用户
+     */
+    toPartShow(row){
+      console.log(row.detail.value)
+      const show = row.detail.value?'1':'0'
+      request({
+        url: '/admin-api/repair/tickets/show',
+        method: 'get',
+        params:{id:this.ticketId,show:show}
+      }).then((res)=>{
+        uni.showToast({
+          title: '设置成功！',
+          icon: 'none'
+        })
+      })
+    },
+
     /**
      * 查看订单详情
      */