增加用户隐私协议，验质增加字段，优化ws

qingyiay

2023-07-12 f52085a9bc8c61cf7097426d7a6b2985d890da68

 pages/driver-page/driver-index/bill-of-lading-details/bill-of-lading-details.vue

@@ -1,7 +1,7 @@
<template>
   <view class="bill-of-lading-details">
      <view class="top-banner"
         style="background: url('https://mx.jzeg.cn:9095/appimg/image/banner/loadingbanner.png') no-repeat;background-size: cover;">
         :style="{ backgroundImage: `url(${onlineurl}/appimg/image/banner/loadingbanner.png)`, backgroundSize: 'cover', backgroundRepeat: 'no-repeat' }">
      </view>
      <view class="top-information">
         <view class="cutomer-name"
@@ -21,8 +21,7 @@
            <view class="basic">
               <view class="coalName">{{ coalDetailsData.coalName||'' }}</view>
               <view class="status-button"
                  style="background: url('https://mx.jzeg.cn:9095/appimg/image/banner/statusbutton.png') no-repeat;
                              background-size: cover;">
                  :style="{ backgroundImage: `url(${onlineurl}/appimg/image/banner/statusbutton.png)`, backgroundSize: 'cover', backgroundRepeat: 'no-repeat' }">
                  {{ coalStatus[coalDetailsData.statusWeigh] || '' }}
               </view>
            </view>
@@ -32,7 +31,7 @@
                     size="40"></u-icon></view>
               <view class="send-date">{{ coalDetailsData.sendDate }}</view>
            </view>
            <view class="coal-code">提煤单编号:&nbsp;&nbsp;{{ coalDetailsData.code || '' }}</view>
            <view class="coal-code">通知单编号:&nbsp;&nbsp;{{ coalDetailsData.code || '' }}</view>
            <view class="order-code">
               订单编号:&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;{{ coalDetailsData.orderCode || '' }}</view>
            <view class="coal-code"
@@ -45,39 +44,7 @@
      </view>

      <!--  称重历史-->
      <view class="weigh-history"
         v-if="showWeigh.length!==0">
         <view class="block-main">
            <view class="weigh-item"
               v-for='item in showWeigh'
               :key="item.id">
               <view class="weigh-time">
                  <u-tag :text="item.createTime.slice(-8,-3)"
                     plain></u-tag>
               </view>
               <view class="item-block">
                  <view class="item">
                     <view class="concrete"
                        style="background: url('https://mx.jzeg.cn:9095/appimg/image/banner/skin.png') no-repeat;background-size: cover;">
                        皮</view>
                     <view class="num">{{ item.skin }}</view>
                  </view>
                  <view class="item">
                     <view class="concrete"
                        style="background: url('https://mx.jzeg.cn:9095/appimg/image/banner/hair.png') no-repeat;background-size: cover;">
                        毛</view>
                     <view class="num">{{ item.hair }}</view>
                  </view>
                  <view class="item">
                     <view class="concrete"
                        style="background: url('https://mx.jzeg.cn:9095/appimg/image/banner/clean.png') no-repeat;background-size: cover;">
                        净</view>
                     <view class="num">{{ item.clean }}</view>
                  </view>
               </view>
            </view>
         </view>
      </view>
      <weigh-item :list="showWeigh"></weigh-item>
      <!-- 时间线 -->
      <view class="timeLine">
         <u-steps :current="dayRZ.length - 1"
@@ -124,7 +91,7 @@
         </view>
      </view>
      <view class="weigh-ability">
         <view class="weigh-button"><u-button text="展示提煤单"
         <view class="weigh-button"><u-button text="展示通知单"
               @click="showCaolPickUpBill"
               type="primary"
               shape="circle"></u-button></view>
@@ -144,7 +111,7 @@
      <view class="completeOutSale">
         <u-modal :show="completeOutSaleShow"
            title="确认"
            content="是否完成外销提煤单"
            content="是否完成外销通知单"
            :showCancelButton="true"
            @confirm="completeOutSaleConfirm"
            @cancel="completeOutSaleCancel"></u-modal>
@@ -153,9 +120,14 @@
</template>

<script>
   import { onlineurl } from '@/api/request.js'
   import { webSocketUrl } from '@/api/request.js';
   import { mapState, mapMutations } from 'vuex';
   import weighItem from '@/components/weighItem.vue'
   export default {
      components: {
         weighItem
      },
      onLoad(value) {
         this.orderPlanId = value.orderPlanId;
         this.yyId = value.yyId;
@@ -169,8 +141,8 @@
            orderPlanId: null,
            yyId: null,
            dayRZ: [],
            coalDetailsData: {}, // 提煤单详情
            currentPageCoalStatus: 0, // 当前页面提煤单状态
            coalDetailsData: {}, // 通知单详情
            currentPageCoalStatus: 0, // 当前页面通知单状态
            // 获取所在磅房参数
            getWeightHouseObj: {
               deptId: '',
@@ -195,7 +167,7 @@
               openId: null,
               openName: ''
            },
            coalStatus: ['未称重', '称重中', '验质中', '称重完成'], // 状态
            coalStatus: ['未称重', '称重中', '验质中', '称重完成', '验质完成'], // 状态
            weighHouseCode: '',
            // 放空弹窗控制变量
            evacuationModalShow: false,
@@ -227,7 +199,8 @@
            completeOutSaleShow: false,
            overTmWaixiao: null,
            // 判读网络状态，
            normalCode: true
            normalCode: true,
            onlineurl,
         };
      },
      onShow() {
@@ -287,7 +260,7 @@
               }
            });
            this.coalDayPage(); //获取日志
            this.getTakeCoal(); //获取提煤单详情
            this.getTakeCoal(); //获取通知单详情
            this.getgetService(); //获取客服
         },
         // 获取客服openid
@@ -304,7 +277,7 @@
               }
            });
         },
         // 获取提煤单详情
         // 获取通知单详情
         getTakeCoal() {
            uni.showLoading({
               title: '加载中'
@@ -312,7 +285,7 @@
            this.$reqGet('getTakeCoal', { takeCoalId: this.orderPlanId }).then(res => {
               uni.hideLoading();
               if (res.code == 0) {
                  console.log(res, '提煤单详情');
                  console.log(res, '通知单详情');
                  this.coalDetailsData = res.data;
                  this.orderType = this.coalDetailsData.orderType;
                  // 判断是否完成外销订单
@@ -333,7 +306,7 @@
                  // 获取客服openId参数赋值
                  this.getServiceOpenid.deptId = this.coalDetailsData.deptId;
                  this.getServiceOpenid.filedId = this.coalDetailsData.filedId;
                  // 获取提煤单状态
                  // 获取通知单状态
                  this.currentPageCoalStatus = this.coalDetailsData.statusWeigh;
                  // 获取原发信息
                  this.primarySkin = this.coalDetailsData.skinTwo;
@@ -388,7 +361,7 @@
               this.$u.toast('服务器错误,请稍后重试')
            }
         },
         // 展示提煤单详情
         // 展示通知单详情
         showCaolPickUpBill() {
            uni.navigateTo({
               url: `/pages/driver-page/driver-index/bill-of-lading-details/coal-pick-up-bill/coal-pick-up-bill?orderPlanId=${this.orderPlanId}`
@@ -455,14 +428,6 @@
                  console.log('获取失败');
               }
            });
         },
         calling() {
            // wx.join1v1Chat({
            //    caller: { nickname: this.name, openid: this.openid }, //oZjXk5RRmbroAfl1m5aZ6hRNvqh4
            //    listener: { nickname: this.serviceInfoObj.openName, openid: 'orutI5YT0yEvARVngdsTmBpisWmw' }, // 这里的openid是fyy的，充当固定的客服openid
            //    backgroundType: 2,
            //    roomType: 'voice'
            // });
         },
         // 称重
         cengZhongClick() {