暂存

pages/index/my.vue

@@ -9,7 +9,7 @@
         </view>
         <view class="iconfont icon-shezhi" />
     </view>
-    <view class="change-user" style="padding: 20rpx;">
+    <!-- <view class="change-user" style="padding: 20rpx;">
         <navigator class="row" url="/pages/index/changePassword">
             <view class="label" style="padding: 10rpx;box-sizing: border-box;">
                 <text class="iconfont icon-mima" style="margin-right: 10rpx;" />
@@ -19,7 +19,7 @@
                 <view class="iconfont icon-a-wodetiaozhuan" />
             </view>
         </navigator>
-    </view>
+    </view> -->
     <up-popup :show="popupShow" mode="right" :customStyle="{
         width: '80vw',
         padding: '0 20rpx',

pages/login/login.vue

@@ -426,12 +426,14 @@ async function handleLogin1(data) {
                 });
             } else {
                 uni.removeStorageSync('isAdmin');
+                uni.removeStorageSync('isCompletion');
                 uni.removeStorageSync('isViewSkus');
                 uni.removeStorageSync('userAuth');
                 uni.setStorageSync('userAuth', res.data)
                 try {
                     let app = res.data.find(v => v.system == "service").modules.find(v => v.systemmodule == "wserve").apps.find(v => v.name == "wxchatserve").meta.auth.map(v => v.option);
                     uni.setStorageSync('isAdmin', app.includes('admin'));
+                    uni.setStorageSync('isCompletion', app.includes('completion'));
                     uni.setStorageSync('isViewSkus', app.includes('skus'));
                 } catch (error) {
                     console.log(error)

pages/skus/index.vue

@@ -45,7 +45,7 @@
                         保修卡号
                     </text>
                     <text style="color: red;">
-                        {{ item.isvoid == 0 ? '已作废 ' : '' }}
+                        {{ item.isvoid == 1 ? '已作废 ' : '' }}
                     </text>{{ item.cardno || ' --' }}
                 </view>
                 <view class="row">

pages/workOrder/changeMsg.vue

@@ -192,16 +192,16 @@ function save() {
                         confirmText: '开始服务',
                         complete: async ({ confirm }) => {
                             if (confirm) {
-                                uni.showLoading({ title: '正在开始工单...', mask: true, });
+                                uni.showLoading({ title: '加载中...', mask: true, });
                                 let start = await $Http.basic({
                                     id: 20230209144503,
                                     "content": {
                                         "sa_workorderid": sa_workorderid
                                     }
                                 })
+                                uni.hideLoading();
                                 console.log("开始工单", start)
                                 $Http.getDetail && $Http.getDetail()
-                                uni.hideLoading();
                             }
                             let pages = getCurrentPages();
                             if (pages[pages.length - 2].route == 'pages/workOrder/index') {

pages/workOrder/detail.vue

@@ -314,9 +314,11 @@ function takeOrders() {
             });
 
         } else {
-            if (res.msg) uni.showToast({
-                title: res.msg,
-                icon: 'none'
+            takeOrderShow.value = false;
+            if (res.msg) uni.showModal({
+                title: '提示',
+                content: res.msg,
+                showCancel: false
             });
         }
     })

utils/Http.js

@@ -44,7 +44,7 @@ class HTTP {
         }
 
         if (process.env.NODE_ENV === 'development') {
-            this.baseUrl = this.urls[0].url;
+            this.baseUrl = this.urls[1].url;
         } else {
             this.baseUrl = this.urls[0].url;
         }