From aaceb7523f1f1c64497159861edf619035e7169f Mon Sep 17 00:00:00 2001
From: "liujw155@outlook.com" <liujw155@outlook.com>
Date: Tue, 29 Sep 2020 18:08:35 +0800
Subject: [PATCH] fix all & add url

---
 src/js/api.js                        |  3 ++-
 src/pages/employee/manage/manage.vue |  4 ++--
 src/pages/index/index.vue            |  3 ++-
 src/pages/turnover/turnover.vue      | 22 +++++++++++++++-------
 src/pages/write_off/list/list.vue    |  5 +++--
 5 files changed, 24 insertions(+), 13 deletions(-)

diff --git a/src/js/api.js b/src/js/api.js
index c9f7e80..5d694d2 100644
--- a/src/js/api.js
+++ b/src/js/api.js
@@ -1,4 +1,5 @@
-export const ORIGIN = `http://testmanager.ouxuanzhineng.cn`;  //  测试
+// export const ORIGIN = `http://testmanager.ouxuanzhineng.cn`;  //  测试
+export const ORIGIN = `https://minimanage.ouxuanzhineng.cn`;  //  正式
 
 export const API = {
   wechatMiniAppLoginAndSync:`${ORIGIN}/user/wechatMiniAppLoginAndSync`,  //  小程序授权
diff --git a/src/pages/employee/manage/manage.vue b/src/pages/employee/manage/manage.vue
index 16a776c..43b5adc 100644
--- a/src/pages/employee/manage/manage.vue
+++ b/src/pages/employee/manage/manage.vue
@@ -21,7 +21,7 @@
                     <image mode="aspectFit" src="/static/images/icon/round_add.png"></image>
                     <text>添加员工</text>
                 </view>
-                <view class="ei-tip" @click="toReview">
+                <view class="ei-tip" @click="toReview" v-if="employeeInfo.count>0">
                     <text>待审核员工</text>
                     <view>
                         <view v-if="employeeInfo.count>0">{{employeeInfo.count || 0}}</view>
@@ -127,7 +127,7 @@ export default {
             let ids = _deleteArr.map(ele=>ele.id);
             util.showModal({
                 title: '提示',
-                content: '移除后，改员工将无法登录和使用欧轩智能商家助手小程序',
+                content: '移除后，该员工将无法登录和使用欧轩智能商家助手小程序',
                 showCancel: true,
                 success: sucRes=>{
                     if(sucRes.confirm){
diff --git a/src/pages/index/index.vue b/src/pages/index/index.vue
index 79b6be7..6d8adef 100644
--- a/src/pages/index/index.vue
+++ b/src/pages/index/index.vue
@@ -98,7 +98,8 @@
 		{
 			id: 5,
 			name: '积分订单',
-			path: '/pages/order_list/order_list',
+			// path: '/pages/order_list/order_list',
+			path: '',
 			serverKey: 1006  // 后端对应权限编号
 		},
 		{
diff --git a/src/pages/turnover/turnover.vue b/src/pages/turnover/turnover.vue
index c73172d..f54b31e 100644
--- a/src/pages/turnover/turnover.vue
+++ b/src/pages/turnover/turnover.vue
@@ -6,10 +6,11 @@
         </view>
         <view class="tc-total-section">
 
-            <view class="tts-address" v-if="tabID == 0&&storeList.length > 1">
+            <view class="tts-address" v-if="tabID == 0&&storeList.length > 1"> 
                 <view>{{pageInfo.name || '-'}}</view>
                 <!-- <image mode="aspectFit" src="/static/images/icon/arrow_b2.png"></image> -->
             </view>
+            <!-- 仅有一家店铺情况下，没有品牌查看权限 -->
             <view class="tts-address" v-else-if="tabID == 1&&storeList.length ==1">
                 <view>{{curSelectStore.name || '-'}}</view>
                 <!-- <image mode="aspectFit" src="/static/images/icon/arrow_b2.png"></image> -->
@@ -116,14 +117,19 @@ export default {
         }
     },
     async onLoad(){
-        let { timeTabID } = this;
-        let _timeObj = this.getTime();
+        try{
+            let { timeTabID } = this;
+            let _timeObj = this.getTime();
 
-        this.curTime = _timeObj;
-        let _storeList = await this.getStoreList();
-        if(_storeList.length == 1)this.tabID = 1;
+            this.curTime = _timeObj;
+            let _storeList = await this.getStoreList();
+            if(_storeList.length == 1)this.tabID = 1;
 
-        this.$nextTick(this.refreshPageInfo);
+            this.$nextTick(this.refreshPageInfo);
+        }catch(err){
+            console.log(err);
+            util.hideLoad();
+        }
 
     },
     methods: {
@@ -196,6 +202,7 @@ export default {
         // 获取品牌店铺列表
         getStoreList(){
             let { brandInfo } = this;
+            util.showLoad();
             return servers.get({
                 url: API.stadiumList,
                 data: {
@@ -204,6 +211,7 @@ export default {
                 failMsg: '加载店铺列表失败！',
             })
             .then(res=>{
+                util.hideLoad();
                 // let _list = [res.list[0]] || [];
                 let _list = res.list || [];
                 this.storeList = _list;
diff --git a/src/pages/write_off/list/list.vue b/src/pages/write_off/list/list.vue
index ff1bd7b..91df60b 100644
--- a/src/pages/write_off/list/list.vue
+++ b/src/pages/write_off/list/list.vue
@@ -101,12 +101,13 @@ export default {
             })
             
         },
-        getOrderList(isLoad){
+        // confirm 页刷新列表
+        getOrderList(isLoad){  
             if(isLoad)util.showLoad();
             servers.get({
                 url: API.verifiedOrderList,
                 data: {
-                    status: 1
+                    status: 1, // 只获取待使用订单
                 },
                 failMsg: '获取订单列表失败！'
             })