Главная Обзор Помощь
Регистрация Вход
zhh
/
front-end
1
0
Ответвить 0
Файлы Задачи 0 Запросы на слияние 0 Вики
Просмотр исходного кода

1.解决冲突、
2.提示没有找到门店

jf 5 лет назад
Родитель
3543435cab c152898eff
Сommit
ab1dbade1c
33 измененных файлов с 527 добавлено и 147 удалено
Разделённый вид Показать статистику Diff
  1. 0 0
      ghs/dist/shop/css/chunk-42590054.f829d13a.css
  2. 0 0
      ghs/dist/shop/css/chunk-5e009b24.66e235c4.css
  3. 1 1
      ghs/dist/shop/index.html
  4. 0 0
      ghs/dist/shop/js/app.773477e0.js
  5. 0 0
      ghs/dist/shop/js/chunk-42590054.58f98404.js
  6. 0 0
      ghs/dist/shop/js/chunk-59dda069.b2177ec6.js
  7. 0 0
      ghs/dist/shop/js/chunk-5e009b24.7c7392bc.js
  8. 0 0
      ghs/dist/shop/js/chunk-fa34bcba.79d89b69.js
  9. 36 49
      ghs/src/views/order/list.vue
  10. 5 0
      ghsApp/src/admin/home/apply.vue
  11. 13 7
      ghsApp/src/admin/home/me.vue
  12. 6 1
      ghsApp/src/admin/home/member.vue
  13. 11 6
      ghsApp/src/admin/home/order.vue
  14. 47 0
      ghsApp/src/admin/home/result.vue
  15. 9 3
      ghsApp/src/admin/home/workbench.vue
  16. 4 0
      ghsApp/src/components/app-result.vue
  17. 46 16
      ghsApp/src/components/none-hd.vue
  18. 118 12
      ghsApp/src/mixins/globalMixins.js
  19. 7 0
      ghsApp/src/pages.json
  20. 7 6
      ghsApp/src/pagesStorehouse/stockWarn/manage.vue
  21. 1 1
      hdApp/src/admin/home/apply.vue
  22. 12 7
      hdApp/src/admin/home/me.vue
  23. 4 2
      hdApp/src/admin/home/member.vue
  24. 4 2
      hdApp/src/admin/home/order.vue
  25. 48 0
      hdApp/src/admin/home/result.vue
  26. 7 1
      hdApp/src/admin/home/workbench.vue
  27. 4 1
      hdApp/src/components/app-result.vue
  28. 6 3
      hdApp/src/components/none-hd.vue
  29. 112 18
      hdApp/src/mixins/globalMixins.js
  30. 7 0
      hdApp/src/pages.json
  31. 1 1
      hdApp/src/pagesClient/official/apply.vue
  32. 6 6
      hdApp/src/pagesStorehouse/stockWarn/manage.vue
  33. 5 4
      mallApp/src/pages/pay/index.vue

Разница между файлами не показана из-за своего большого размера
+ 0 - 0
ghs/dist/shop/css/chunk-42590054.f829d13a.css


Разница между файлами не показана из-за своего большого размера
+ 0 - 0
ghs/dist/shop/css/chunk-5e009b24.66e235c4.css


+ 1 - 1
ghs/dist/shop/index.html
Просмотреть файл 

@@ -43,4 +43,4 @@
 
 			.once .sub-title {
 
 				color: #ababab;
 
 				font-size: 12px;
 
-			}</style><link href="/css/app.6f07e55a.css" rel="preload" as="style"><link href="/css/chunk-libs.2e1e87b5.css" rel="preload" as="style"><link href="/js/app.28567ed6.js" rel="preload" as="script"><link href="/js/chunk-libs.1c1e0cb4.js" rel="preload" as="script"><link href="/css/chunk-libs.2e1e87b5.css" rel="stylesheet"><link href="/css/app.6f07e55a.css" rel="stylesheet"></head><body><noscript></noscript><div id="app"><div class="once"><div class="container"><div class="title">正在加载资源</div><div class="sub-title">初次加载资源可能需要较多时间 请耐心等待</div></div><div class="footer"><a href="https://www.baidu.com/" target="_blank">花卉宝</a></div></div></div><script src="http://img.hzghd.com/cdn/vue/2.6.10/vue.min.js"></script><script src="http://img.hzghd.com/cdn/vue-router/3.1.3/vue-router.min.js"></script><script src="http://img.hzghd.com/cdn/vuex/3.1.1/vuex.min.js"></script><script src="http://img.hzghd.com/cdn/clipboard.js/2.0.4/clipboard.min.js"></script><script src="http://img.hzghd.com/cdn/axios/0.19.0-beta.1/axios.min.js"></script><script src="http://img.hzghd.com/cdn/nprogress/0.2.0/nprogress.min.js"></script><script src="http://img.hzghd.com/cdn/Mock.js/1.0.1-beta3/mock-min.js"></script><script src="http://img.hzghd.com/cdn/quill/2.0.0-dev.3/quill.min.js"></script><script src="http://img.hzghd.com/cdn/element-ui/2.13.0/index.js"></script><script src="http://img.hzghd.com/cdn/viewerjs/1.3.7/viewer.min.js"></script><script src="http://img.hzghd.com/cdn/echarts/4.4.0-rc.1/echarts.min.js"></script><script src="http://img.hzghd.com/cdn/npm/vue-echarts@4.0.2.js"></script><script src="/js/chunk-libs.1c1e0cb4.js"></script><script src="/js/app.28567ed6.js"></script></body></html>
 
+			}</style><link href="/css/app.6f07e55a.css" rel="preload" as="style"><link href="/css/chunk-libs.2e1e87b5.css" rel="preload" as="style"><link href="/js/app.773477e0.js" rel="preload" as="script"><link href="/js/chunk-libs.1c1e0cb4.js" rel="preload" as="script"><link href="/css/chunk-libs.2e1e87b5.css" rel="stylesheet"><link href="/css/app.6f07e55a.css" rel="stylesheet"></head><body><noscript></noscript><div id="app"><div class="once"><div class="container"><div class="title">正在加载资源</div><div class="sub-title">初次加载资源可能需要较多时间 请耐心等待</div></div><div class="footer"><a href="https://www.baidu.com/" target="_blank">花卉宝</a></div></div></div><script src="http://img.hzghd.com/cdn/vue/2.6.10/vue.min.js"></script><script src="http://img.hzghd.com/cdn/vue-router/3.1.3/vue-router.min.js"></script><script src="http://img.hzghd.com/cdn/vuex/3.1.1/vuex.min.js"></script><script src="http://img.hzghd.com/cdn/clipboard.js/2.0.4/clipboard.min.js"></script><script src="http://img.hzghd.com/cdn/axios/0.19.0-beta.1/axios.min.js"></script><script src="http://img.hzghd.com/cdn/nprogress/0.2.0/nprogress.min.js"></script><script src="http://img.hzghd.com/cdn/Mock.js/1.0.1-beta3/mock-min.js"></script><script src="http://img.hzghd.com/cdn/quill/2.0.0-dev.3/quill.min.js"></script><script src="http://img.hzghd.com/cdn/element-ui/2.13.0/index.js"></script><script src="http://img.hzghd.com/cdn/viewerjs/1.3.7/viewer.min.js"></script><script src="http://img.hzghd.com/cdn/echarts/4.4.0-rc.1/echarts.min.js"></script><script src="http://img.hzghd.com/cdn/npm/vue-echarts@4.0.2.js"></script><script src="/js/chunk-libs.1c1e0cb4.js"></script><script src="/js/app.773477e0.js"></script></body></html>

Разница между файлами не показана из-за своего большого размера
+ 0 - 0
ghs/dist/shop/js/app.773477e0.js


Разница между файлами не показана из-за своего большого размера
+ 0 - 0
ghs/dist/shop/js/chunk-42590054.58f98404.js


Разница между файлами не показана из-за своего большого размера
+ 0 - 0
ghs/dist/shop/js/chunk-59dda069.b2177ec6.js


Разница между файлами не показана из-за своего большого размера
+ 0 - 0
ghs/dist/shop/js/chunk-5e009b24.7c7392bc.js


Разница между файлами не показана из-за своего большого размера
+ 0 - 0
ghs/dist/shop/js/chunk-fa34bcba.79d89b69.js


+ 36 - 49
ghs/src/views/order/list.vue
Просмотреть файл 

@@ -54,12 +54,13 @@
 
         <template >
 
           <div style="display: flex">
 
             <div v-for="res in scope.row.buttonList" >
 
-              <el-button v-if="res.type=='item'&&res.show==1&&res.disable==0" size="small">该花材</el-button>
 
-              <el-button v-if="res.type=='item'&&res.show==1&&res.disable==1" size="small" disabled>该花材</el-button>
 
+				<el-button v-if="res.type=='item'&&res.show==1&&res.disable==0" size="small">改花材</el-button>
 
+				<el-button v-if="res.type=='item'&&res.show==1&&res.disable==1" size="small" disabled>改花材</el-button>
 
 
-              <el-button v-if="res.type=='send'&&res.show==1&&res.disable==0" @click="shipDrawFn(scope.row)" size="mini" type="primary" plain >发货</el-button>
 
-              <el-button v-if="res.type=='send'&&res.show==1&&res.disable==1" disabled size="mini" type="primary" plain >发货</el-button>
 
+				<el-button v-if="res.type=='send'&&res.show==1&&res.disable==0" @click="shipDrawFn(scope.row)" size="mini" type="primary" plain >发货</el-button>
 
+				<el-button v-if="res.type=='send'&&res.show==1&&res.disable==1" disabled size="mini" plain>发货</el-button>
 
 
+<<<<<<< HEAD
 
               <el-popover v-if="res.type=='selfGet'&&res.show==1&&res.disable==0" style="margin-left:14px;" placement="top" width="160" :ref="'popover-'+scope.row.id">
 
                 <p>确认已自取？</p>
 
                 <div style="text-align: right; margin: 0">
 
@@ -69,38 +70,24 @@
 
                 <el-button slot="reference" size="mini" type="primary" plain>自取</el-button>
 
               </el-popover>
 
               <el-button v-if="res.type=='selfGet'&&res.show==1&&res.disable==1" style="margin-left:14px;" size="small" disabled>自取</el-button>
 
+=======
 
+				<el-popover v-if="res.type=='selfGet'&&res.show==1&&res.disable==0" style="margin-left:14px;" placement="top" width="160" :ref="'popover-' + scope.row.id">
 
+				<p>确认已自取？</p>
 
+				<div style="text-align: right; margin: 0">
 
+					<el-button size="mini" type="text" @click="selfGetCancel(scope.row.id)">取消</el-button>
 
+					<el-button type="primary" size="mini" @click="noSendShipFn(scope.row)">确定</el-button>
 
+				</div>
 
+				<el-button slot="reference" size="mini" type="primary" plain>自取</el-button>
 
+				</el-popover>
 
+
 
+				<el-button v-if="res.type=='selfGet'&&res.show==1&&res.disable==1" style="margin-left:14px;" size="small" disabled>自取</el-button>
 
+>>>>>>> c152898eff6c05dd8e94bfbce1875015c3e46726
 
 
-              <el-button v-if="res.type=='print'&&res.show==1&&res.disable==0" @click="printOrder(scope.row)" size="mini" type="primary" plain style="margin-left:14px;">打印</el-button>
 
-              <el-button v-if="res.type=='print'&&res.show==1&&res.disable==1" disabled size="mini" type="primary" plain style="margin-left:14px;">打印</el-button>
 
+				<el-button v-if="res.type=='print'&&res.show==1&&res.disable==0" @click="printOrder(scope.row)" size="mini" type="primary" plain style="margin-left:14px;">打印</el-button>
 
+				<el-button v-if="res.type=='print'&&res.show==1&&res.disable==1" disabled size="mini" plain style="margin-left:14px;">打印</el-button>
 
             </div>
 
           </div>
 
         </template>
 
-
 
-<!--				<template v-if="scope.row.status == 1">-->
 
-<!--					<el-button size="small" disabled>打印</el-button>-->
 
-<!--					<el-button size="small" disabled>自取</el-button>-->
 
-<!--					<el-button size="small" disabled>发货</el-button>-->
 
-<!--				</template>-->
 
-<!--				<template v-else-if="['4', '5', '6'].indexOf(scope.row.status) != -1"></template>-->
 
-<!--				<template v-else>-->
 
-<!--					<template v-if="scope.row.currentFlow == 1">-->
 
-<!--						<el-popover placement="top" width="160" :ref="'popover-' + scope.row.id">-->
 
-<!--							<p>确认已自取？</p>-->
 
-<!--							<div style="text-align: right; margin: 0">-->
 
-<!--								<el-button size="mini" type="text" @click="selfGetCancel(scope.row.id)">取消</el-button>-->
 
-<!--								<el-button type="primary" size="mini" @click="noSendShipFn(scope.row)">确定</el-button>-->
 
-<!--							</div>-->
 
-<!--							<el-button slot="reference" size="mini" type="primary" plain>自取</el-button>-->
 
-<!--						</el-popover>-->
 
-<!--						<el-button @click="shipDrawFn(scope.row)" size="mini" type="primary" plain style="margin-left:14px;">发货</el-button>-->
 
-<!--						<el-button @click="printOrder(scope.row)" size="mini" type="primary" plain style="margin-left:14px;">打印</el-button>-->
 
-<!--					</template>-->
 
-<!--					<template v-else>-->
 
-<!--						<el-button size="mini" type="primary" plain @click="shipDrawFn(scope.row)">发货</el-button>-->
 
-<!--						<el-button @click="printOrder(scope.row)" size="mini" type="primary" plain style="margin-left:14px;">打印</el-button>-->
 
-<!--					</template>-->
 
-
 
-<!--				</template>-->
 
 			</template>
 
 		</x-crud>
 
 		<!-- 用户详情 -->
 
@@ -112,9 +99,9 @@
 
 
       <table border="0" width="780" style="border:solid 1px #fff;border-collapse:collapse">
 
         <tr>
 
-          <td style="padding: 10px;width: 260px;">客户：{{orderMsg.customName}}</td>
 
-          <td style="padding: 10px;width: 260px;">单号：{{orderMsg.orderSn}}</td>
 
-          <td style="padding: 10px;width: 260px;">日期：{{orderMsg.deadline}}</td>
 
+          <td style="padding: 10px;width: 260px;">客户：{{orderInfo.customName}}</td>
 
+          <td style="padding: 10px;width: 260px;">单号：{{orderInfo.orderSn}}</td>
 
+          <td style="padding: 10px;width: 260px;">日期：{{orderInfo.deadline}}</td>
 
         </tr>
 
       </table>
 
       <table border="1" width="780" style="border:solid 1px black;border-collapse:collapse">
 
@@ -127,7 +114,7 @@
 
           <td style="padding: 10px;width: 100px;text-align: center;">金额</td>
 
           <td style="padding: 10px;width: 100px;text-align: center;">备注</td>
 
         </tr>
 
-        <tr v-for="(res,i) in orderMsg.product">
 
+        <tr v-for="(res,i) in orderInfo.product">
 
           <td style="padding: 10px;width: 100px;text-align: center;">{{ i+1 }}</td>
 
           <td style="padding: 10px;width: 100px;text-align: center;">{{ res.name }}</td>
 
           <td style="padding: 10px;width: 100px;text-align: center;">扎/支</td>
 
@@ -138,19 +125,19 @@
 
           <td style="padding: 10px;width: 100px;text-align: center;"></td>
 
         </tr>
 
         <tr>
 
-          <td style="padding: 10px;width: 100px;" colspan="2">合计：{{orderMsg.actPrice}}</td>
 
-          <td style="padding: 10px;width: 100px;" colspan="2">实收：{{orderMsg.debt==0?orderMsg.actPrice:'0.00'}}</td>
 
-          <td style="padding: 10px;width: 100px;" colspan="2">欠款：{{orderMsg.debt==1?orderMsg.actPrice:'0.00'}}</td>
 
+          <td style="padding: 10px;width: 100px;" colspan="2">合计：{{orderInfo.actPrice}}</td>
 
+          <td style="padding: 10px;width: 100px;" colspan="2">实收：{{orderInfo.debt==0?orderInfo.actPrice:'0.00'}}</td>
 
+          <td style="padding: 10px;width: 100px;" colspan="2">欠款：{{orderInfo.debt==1?orderInfo.actPrice:'0.00'}}</td>
 
           <td style="padding: 10px;width: 100px;"></td>
 
         </tr>
 
         <tr>
 
           <td style="padding: 10px;width: 100px;">其他说明：</td>
 
-          <td style="padding: 10px;width: 100px;" colspan="6">{{orderMsg.remark}}</td>
 
+          <td style="padding: 10px;width: 100px;" colspan="6">{{orderInfo.remark}}</td>
 
         </tr>
 
       </table>
 
       <table border="0" width="780" style="border:solid 1px #fff;border-collapse:collapse">
 
         <tr >
 
-          <td style="padding: 10px;width: 260px;">开单：{{orderMsg.shopAdminName}}</td>
 
+          <td style="padding: 10px;width: 260px;">开单：{{orderInfo.shopAdminName}}</td>
 
           <td style="padding: 10px;width: 260px;">配送：</td>
 
           <td style="padding: 10px;width: 260px;">打印时间：{{todays(1)}}</td>
 
         </tr>
 
@@ -201,7 +188,7 @@ export default {
 
 				}
 
 			],
 
 			optionData: {},
 
-      orderMsg:'',
 
+      orderInfo:'',
 
 		};
 
 	},
 
 	created() {
 
@@ -231,7 +218,7 @@ export default {
 
 		},
 
     printOrder(e){
 
       this.$service.order.info({ id: e.id }).then(res => {
 
-        this.orderMsg = res;
 
+        this.orderInfo = res;
 
         this.$nextTick(() => {
 
           let LODOP = getLodop();
 
 
@@ -393,12 +380,12 @@ export default {
 
 				])
 
 				.on('refresh', async (params, { next }) => {
 
 					// 继续执行刷新
 
-					let  asset  = await next(params);
 
-					this.tabsData[0].val = asset.allNum;
 
-					this.tabsData[1].val = asset.unPayNum;
 
-					this.tabsData[2].val = asset.unSendNum;
 
-					this.tabsData[3].val = asset.sendingNum;
 
-					this.tabsData[4].val = asset.finishNum;
 
+					let  res  = await next(params);
 
+					this.tabsData[0].val = res.shop.totalOrder;
 
+					this.tabsData[1].val = res.shop.unPayOrder;
 
+					this.tabsData[2].val = res.shop.unSendOrder;
 
+					this.tabsData[3].val = res.shop.sendingOrder;
 
+					this.tabsData[4].val = res.shop.finishOrder;
 
 				})
 
 				.done();
 
 			app.refresh({ status: this.tabIndex });

+ 5 - 0
ghsApp/src/admin/home/apply.vue
Просмотреть файл 

@@ -24,12 +24,17 @@
 
             </view>
 
         </view>
 
         <kd-entrance></kd-entrance>
 
+        <none-hd :show="AUTHORITY_SHOW" :title="MODEL_TITLE" :btnText="MODEL_BTN_TEXT" @bthClick="toFreeApply_HOME" :authShow="true" @experienceClick="experienceFun"></none-hd>
 
     </view>
 
 </template>
 
 
 <script>
 
+import noneHd from "@/components/none-hd";
 
     export default { // 应用页面
 
         name:'Apply',
 
+        components: {
 
+          noneHd
 
+        },
 
         data(){
 
             return {
 
                 menuList: [

+ 13 - 7
ghsApp/src/admin/home/me.vue
Просмотреть файл 

@@ -122,6 +122,7 @@
 
 
           </view>
 
         </view>
 
+        <none-hd :show="AUTHORITY_SHOW" :title="MODEL_TITLE" :btnText="MODEL_BTN_TEXT" @bthClick="toFreeApply_HOME" :authShow="true" experienceFun></none-hd>
 
       </view>
 
     </template>
 
     <DorpdownSelect
 
@@ -133,6 +134,7 @@
 
       @selectSussess="selectSussess"
 
     ></DorpdownSelect>
 
     <kd-entrance></kd-entrance>
 
+    <none-hd :show="AUTHORITY_SHOW" :title="MODEL_TITLE" :btnText="MODEL_BTN_TEXT" @bthClick="toFreeApply_HOME" :authShow="true" @experienceClick="experienceFun"></none-hd>
 
   </view>
 
 </template>
 
 
@@ -146,6 +148,7 @@ import { selectShop } from "@/mixins";
 
 import { getUser } from "@/utils/auth";
 
 import { list } from "@/mixins";
 
 import { mapGetters } from "vuex";
 
+import noneHd from "@/components/none-hd";
 
 export default {
 
   // 我的
 
   name: "Me",
 
@@ -153,6 +156,7 @@ export default {
 
     AppAvatarModule,
 
     TuiListCell,
 
     DorpdownSelect,
 
+    noneHd
 
   },
 
   mixins: [selectShop, list],
 
   computed: {
 
@@ -176,13 +180,15 @@ export default {
 
       this.$refs.dorpdownSelect.dropdownShow = true;
 
     },
 
     async init () {
 
-      try {
 
-        const { data } = await mainMy();
 
-        this.infoData = data;
 
-        //不要删除此输出，方法查看 shish 20210512
 
-        console.log('商家ID',data.sjId,'门店ID',data.shopId)
 
-        uni.stopPullDownRefresh();
 
-      } finally {
 
+      if(!this.AUTHORITY_SHOW) {
 
+        try {
 
+          const { data } = await mainMy();
 
+          this.infoData = data;
 
+          //不要删除此输出，方法查看 shish 20210512
 
+          console.log('商家ID',data.sjId,'门店ID',data.shopId)
 
+          uni.stopPullDownRefresh();
 
+        } finally {
 
+        }
 
       }
 
     },
 
     async selectSussess () {

+ 6 - 1
ghsApp/src/admin/home/member.vue
Просмотреть файл 

@@ -57,6 +57,7 @@
 
       <app-wrapper-empty :is-empty="$util.isEmpty(list.data)" />
 
     </block>
 
     <kd-entrance></kd-entrance>
 
+    <none-hd :show="AUTHORITY_SHOW" :title="MODEL_TITLE" :btnText="MODEL_BTN_TEXT" @bthClick="toFreeApply_HOME" :authShow="true" @experienceClick="experienceFun"></none-hd>
 
   </div>
 
 </template>
 
 
@@ -69,6 +70,7 @@ import appVipModule from "@/components/module/app-vip";
 
 import AppTag from "@/components/module/app-tag.vue";
 
 import { list } from "@/mixins";
 
 import { getClass, getList } from "@/api/member";
 
+import noneHd from "@/components/none-hd";
 
 export default {
 
   name: "admin-memebr",
 
   components: {
 
@@ -78,6 +80,7 @@ export default {
 
     AppWrapperEmpty,
 
     appVipModule,
 
     AppTag,
 
+    noneHd
 
   },
 
   mixins: [list],
 
   data() {
 
@@ -103,7 +106,9 @@ export default {
 
   onLoad(option) {},
 
   methods: {
 
     init() {
 
-      this._list();
 
+      if(!this.AUTHORITY_SHOW) {
 
+        this._list();
 
+      }
 
     },
 
     // 列表
 
     _list() {

+ 11 - 6
ghsApp/src/admin/home/order.vue
Просмотреть файл 

@@ -129,6 +129,7 @@
 
       themeColor="#4C83D6"
 
       fields="day"
 
     ></rangeDatePick>
 
+    <none-hd :show="AUTHORITY_SHOW" :title="MODEL_TITLE" :btnText="MODEL_BTN_TEXT" @bthClick="toFreeApply_HOME" :authShow="true" @experienceClick="experienceFun"></none-hd>
 
   </div>
 
 </template>
 
 
@@ -151,6 +152,7 @@ import AppSearchModule from "@/components/module/app-search";
 
 import DorpdownSelect from "@/components/module/dorpdownSelect";
 
 import AppAvatarModule from "@/components/module/app-avatar";
 
 import rangeDatePick from "@/components/pyh-rdtpicker/pyh-rdtpicker.vue";
 
+import noneHd from "@/components/none-hd";
 
 export default {
 
   name: "order-list",
 
   components: {
 
@@ -162,6 +164,7 @@ export default {
 
     AppSearchModule,
 
     DorpdownSelect,
 
     AppAvatarModule,
 
+    noneHd
 
   },
 
   mixins: [list],
 
   computed: { ...mapGetters(["getLoginInfo", "getDictionariesInfo"]) },
 
@@ -350,12 +353,14 @@ export default {
 
         page: this.list.page,
 
       }).then((res) => {
 
         this.completes(res);
 
-        if (this.$util.isEmpty(res.data)) return false;
 
-        this.tabs[0].value = res.data.allNum || 0;
 
-        this.tabs[1].value = res.data.unPayNum || 0;
 
-        this.tabs[2].value = res.data.unSendNum || 0;
 
-        this.tabs[3].value = res.data.sendingNum || 0;
 
-        this.tabs[4].value = res.data.finishNum || 0;
 
+        if (this.$util.isEmpty(res.data)){
 
+          return false
 
+        }
 
+        this.tabs[0].value = res.data.shop.totalOrder || 0;
 
+        this.tabs[1].value = res.data.shop.unPayOrder || 0;
 
+        this.tabs[2].value = res.data.shop.unSendOrder || 0;
 
+        this.tabs[3].value = res.data.shop.sendingOrder || 0;
 
+        this.tabs[4].value = res.data.shop.finishOrder || 0;
 
       });
 
     },
 
     change(e) {

+ 47 - 0
ghsApp/src/admin/home/result.vue
Просмотреть файл 

@@ -0,0 +1,47 @@
 
+<template>
 
+<!-- icondaizhifu -->
 
+	<appResult :title="status == '2' ? '审核中' : '审核通过'" :icon="status == '2' ? 'icondaizhifu' : 'iconchenggong'">
 
+		<button class="admin-button-com blue big" v-if="status != '2'" @click="loginSys">登录后台{{status}}</button>
 
+		<button class="admin-button-com big" @click="openInform">开启通知</button>
 
+	</appResult>
 
+</template>
 
+
 
+<script>
 
+import appResult from "@/components/app-result";
 
+export default {
 
+	name: "BillingResult", // 开单结果
 
+  data(){
 
+    return {
 
+      status: '1'
 
+    }
 
+    
+  },
 
+	components: {
 
+		appResult
 
+	},
 
+  onLoad(option){
 
+    this.status = option.status
 
+  },
 
+	methods: {
 
+    loginSys(){
 
+      this.$util.pageTo({
 
+        url: '/admin/home/workbench',
 
+        type: 4
 
+      })
 
+    },
 
+    openInform(){
 
+      this.pageTo({
 
+        url: '/pagesClient/official/warn',
 
+        type: 2
 
+      })
 
+    }
 
+	}
 
+};
 
+</script>
 
+
 
+<style lang="scss" scoped>
 
+.admin-button-com {
 
+	margin-bottom: 20px;
 
+	width: 100%;
 
+}
 
+</style>

+ 9 - 3
ghsApp/src/admin/home/workbench.vue
Просмотреть файл 

@@ -111,6 +111,7 @@
 
 				</div>
 
 			</template>
 
 		</modal-module>
 
+    <none-hd :show="AUTHORITY_SHOW" :title="MODEL_TITLE" :btnText="MODEL_BTN_TEXT" @bthClick="toFreeApply_HOME" :authShow="true" @experienceClick="experienceFun"></none-hd>
 
 	</div>
 
 </template>
 
 
@@ -123,6 +124,7 @@ import { getDataTimestamp } from "@/utils/common";
 
 import { getWeixinId } from "@/api/invite/index";
 
 import { getUser } from "@/utils/auth";
 
 import { consoleIndex } from "@/api/workbench";
 
+import noneHd from "@/components/none-hd";
 
 // import priceSocket from "@/mixins/priceSocket";
 
 
 export default {
 
@@ -130,7 +132,8 @@ export default {
 
 	components: {
 
 		ModalModule,
 
 		FabModule,
 
-		AppAvatarModule
 
+		AppAvatarModule,
 
+    noneHd
 
 	},
 
 	// mixins:[priceSocket],
 
 	data() {
 
@@ -302,7 +305,10 @@ export default {
 
 	},
 
 	methods: {
 
 		init() {
 
-			getWeixinId().then(res => {
 
+      this._init
 
+		},
 
+    _init(){
 
+      getWeixinId().then(res => {
 
 				this.getappIdList = res.data
 
 			});
 
 			getUser().then(res => {
 
@@ -332,7 +338,7 @@ export default {
 
 					this.totalData[5].value = asset.totalPurchase;
 
 				}
 
 			});
 
-		},
 
+    },
 
 		goPage (item) {
 
 			if (item.url === '/admin/my-mall') {
 
 				this.getMyMall()

+ 4 - 0
ghsApp/src/components/app-result.vue
Просмотреть файл 

@@ -60,6 +60,10 @@ export default {
 
 			font-size: 170px;
 
 			color: $mainColor1;
 
 		}
 
+    .icondaizhifu {
 
+			font-size: 170px;
 
+			color: #ffa92e;
 
+		}
 
 		.result-title {
 
 			margin: 50px 0 70px;
 
 			font-size: 32px;

+ 46 - 16
ghsApp/src/components/none-hd.vue
Просмотреть файл 

@@ -1,59 +1,89 @@
 
 <template>
 
   <view class="model" v-if="show">
 
-    <image :src="`${constant.imgUrl}/ghs/home/deserve.png`" class="noData_img"></image>
 
-    <view class="no_data_text">您还没有花店,无法采购哦~</view>
 
-    <view class="freeApply" @click=" pageTo({url: '/pagesClient/official/index'})">免费申请</view>
 
+    <image
 
+      :src="`${constant.imgUrl}/ghs/home/deserve.png`"
 
+      class="noData_img"
 
+    ></image>
 
+    <view class="no_data_text">{{title}}</view>
 
+    <view class="freeApply" @click="apply">{{btnText}}</view>
 
+    <view class="experience" v-if="authShow" @click="experienceClick">体验</view>
 
   </view>
 
 </template>
 
 
 <script>
 
 export default {
 
   props: {
 
-    show:{
 
-      type:Boolean,
 
-      default: true
 
+    show: {
 
+      type: Boolean,
 
+      default: true,
 
     },
 
+    btnText: {
 
+      type: String,
 
+      default: '',
 
+    },
 
+    title: {
 
+      type: String,
 
+      default: '',
 
+    },
 
+    authShow: {
 
+      type: Boolean,
 
+      default: false,
 
+    }
 
   },
 
   data() {
 
     return {
 
       constant: this.$constant,
 
+    };
 
+  },
 
+  methods: {
 
+    apply() {
 
+      this.$emit('bthClick')
 
+    },
 
+    experienceClick(){
 
+      this.$emit('experienceClick')
 
     }
 
-  }
 
-}
 
+  },
 
+};
 
 </script>
 
 
 <style lang="scss" scoped>
 
-.model{
 
+.model {
 
   position: fixed;
 
   z-index: 9999;
 
   top: 0;
 
   left: 0;
 
   width: 100vw;
 
   height: 100vh;
 
-  background: rgba(0,0,0, 0.6);
 
+  background: rgba(0, 0, 0, 0.6);
 
   color: #fff;
 
+  overflow: hidden;
 
   text-align: center;
 
-  &>.noData_img{
 
+  & > .noData_img {
 
     width: 318upx;
 
     height: 318upx;
 
     margin: 332upx auto 0;
 
   }
 
-  &>.no_data_text{
 
+  & > .no_data_text {
 
     font-size: 32px;
 
-    color: #FFFFFF;
 
+    color: #ffffff;
 
     text-align: center;
 
     margin: 50upx 0;
 
   }
 
-  &>.freeApply{
 
+  & > .freeApply {
 
     width: 376px;
 
     height: 88px;
 
     line-height: 88upx;
 
-    background: linear-gradient(90deg, #3385FF, #33B0FF);
 
+    background: linear-gradient(90deg, #3385ff, #33b0ff);
 
     border-radius: 44px;
 
     margin: 0 auto;
 
     font-size: 32px;
 
-    color: #FFFFFF;
 
+    color: #ffffff;
 
     text-align: center;
 
   }
 
+  &>.experience{
 
+    margin-top: 40upx;
 
+    color: #fff;
 
+    font-size: 30upx;
 
+  }
 
 }
 
 </style>

+ 118 - 12
ghsApp/src/mixins/globalMixins.js
Просмотреть файл 

@@ -2,6 +2,8 @@ import store from '@/store'
 
 import { mapGetters,mapActions } from 'vuex'
 
 import { pageTo, getCheckLogin, isLogin } from '@/utils/util.js'
 
 import { getUser, wxLoginFn } from '@/utils/auth'
 
+import { postWxCode, getDictionaries } from '@/api/mini'
 
+import { getStaffApi } from '@/api/common'
 
 import constant from '@/constant'
 
 export default {
 
 	data() {
 
@@ -13,7 +15,11 @@ export default {
 
 			// 全局混入，插入全局工具函数
 
 			$util: this.$util,
 
 			// 全局混入，插入全局跳转函数
 
-			pageTo: pageTo
 
+      pageTo: pageTo,
 
+      AUTHORITY_SHOW: false,
 
+      shopAdminId: null,
 
+      MODEL_TITLE: '您还没有网店哦',
 
+      MODEL_BTN_TEXT: '免费申请'
 
 		}
 
 	},
 
 	computed: {
 
@@ -29,7 +35,15 @@ export default {
 
 		if (option.account) {
 
 			uni.setStorageSync('account', option.account)
 
 		}
 
-		uni.setStorageSync('currentQuery', JSON.stringify(option))
 
+    uni.setStorageSync('currentQuery', JSON.stringify(option))
 
+    console.log(uni.getStorageSync('SHOP_ADMIN_STROAGE_SHOW'),'this.shopAdminId', this.getLoginInfo, this.getLoginInfo.openShop)
 
+    if (uni.getStorageSync('SHOP_ADMIN_STROAGE_SHOW') == '0') {
 
+      this.AUTHORITY_SHOW = true
 
+    } else if (this.getLoginInfo.openShop == '2') {
 
+      this.MODEL_TITLE = '已申请'
 
+      this.MODEL_BTN_TEXT = '查看申请进度'
 
+      this.AUTHORITY_SHOW = true
 
+    }
 
 		if(this.$util.isEmpty(this.getLoginInfo)){
 
 			wxLoginFn(true).then(res => {
 
 				//客户可以访问的页面
 
@@ -43,15 +57,16 @@ export default {
 
 				})
 
 				if (needRedirect === true) {
 
 					//客户访问不能查看的页面跳转去官网
 
-					if (res.data.shopAdminId == '0') {
 
-						this.$util.pageTo({
 
-							url: "/pagesClient/official/index",
 
-							type: 2,
 
-							query: {
 
-								...this.option
 
-							}
 
-						});
 
-					}
 
+          if (res.data.shopAdminId == '0' && res.data.admin.openShop == '1') {
 
+            this.AUTHORITY_SHOW = true;
 
+            uni.setStorageSync('SHOP_ADMIN_STROAGE_SHOW', res.data.shopAdminId)
 
+					} else if (res.data.admin.openShop == '2' && res.data.shopAdminId == '0') {
 
+            this.MODEL_TITLE = '已申请'
 
+            this.MODEL_BTN_TEXT = '查看申请进度'
 
+            this.AUTHORITY_SHOW = true
 
+            uni.removeStorageSync('SHOP_ADMIN_STROAGE_SHOW')
 
+            uni.setStorageSync('OPEN_SHOP_ID', res.data.admin.openShop)
 
+          }
 
 				}
 
 				getUser(true)
 
 				//获取门店信息
 
@@ -73,7 +88,98 @@ export default {
 
 
 	},
 
 	methods: {
 
-		...mapActions(['setUserShopAll'])
 
+    ...mapActions(['setUserShopAll']),
 
+    toFreeApply_HOME () {
 
+      let status = ''
 
+        if (uni.getStorageSync('SHOP_ADMIN_STROAGE_SHOW') == '0') {
 
+          this.$util.pageTo({
 
+            url: "/pagesClient/official/index",
 
+            type: 2,
 
+            query: {
 
+              ...this.option
 
+            }
 
+          });
 
+        } else {
 
+          getStaffApi().then(res => {
 
+            console.log(res)
 
+            if (res.data.openShop == '2') {
 
+              status = '2'
 
+            } else if (res.data.openShop == '3') {
 
+              status = '3'
 
+            }
 
+            this.$util.pageTo({
 
+              url: '/admin/home/result',
 
+              type: 2,
 
+              query: {
 
+                status
 
+              }
 
+            })
 
+          }).catch(err => {})
 
+          // this.$util.pageTo({
 
+          //   url: '/admin/home/result',
 
+          //   type: 2,
 
+          //   query: {
 
+          //     status: '2'
 
+          //   }
 
+          // })
 
+      }
 
+    },
 
+    experienceFun(){
 
+      /**姜枫 2021.04.30  小程序审核体验账号**/
 
+      postWxCode().then(subRes => {
 
+        if (this.$util.isEmpty(subRes)) {
 
+          return false
 
+        }
 
+        uni.setStorageSync('token', subRes.data.token)
 
+        uni.setStorageSync('shopId', subRes.data.admin.currentShopId)
 
+        getDictionaries({ token: subRes.data.token }).then(res => {
 
+          if (this.$util.isEmpty(res)) {
 
+            return false
 
+          }
 
+          this.$store.commit('setDictionariesInfo', {
 
+            ...res.data.dict,
 
+            ...res.data
 
+          })
 
+          this.$store.commit('setMyShopInfo', {
 
+            ...res.data.shop,
 
+            ...res.data
 
+          })
 
+        })
 
+        this.$store.commit('setLoginInfo', {
 
+          ...subRes.data.admin,
 
+          ...subRes.data
 
+        })
 
+        uni.removeStorageSync('SHOP_ADMIN_STROAGE_SHOW')
 
+        uni.removeStorageSync('OPEN_SHOP_ID')
 
+        this.AUTHORITY_SHOW = false
 
+        //启动更新逻辑 shish 2020.5.18
 
+        if (subRes.data.update == 1) {
 
+          const updateManager = wx.getUpdateManager()
 
+          updateManager.onCheckForUpdate(function (res) {
 
+            // 请求完新版本信息的回调
 
+            console.log(res.hasUpdate)
 
+          })
 
+          updateManager.onUpdateReady(function () {
 
+            wx.showModal({
 
+              title: '更新提示',
 
+              content: '新版本已经准备好，是否重启应用？',
 
+              success(res) {
 
+                if (res.confirm) {
 
+                  // 新的版本已经下载好，调用 applyUpdate 应用新版本并重启
 
+                  updateManager.applyUpdate()
 
+                }
 
+              }
 
+            })
 
+          })
 
+          updateManager.onUpdateFailed(function () {})// 新版本下载失败
 
+          return true;
 
+        }
 
+        getUser(true)
 
+        //获取门店信息
 
+        this.setUserShopAll();
 
+        uni.switchTab({url:'/admin/home/workbench'})
 
+      })
 
+    },
 
 	},
 
 	mounted() {
 
 		if (this.mInit) {

+ 7 - 0
ghsApp/src/pages.json
Просмотреть файл 

@@ -7,6 +7,13 @@
 
 				"enablePullDownRefresh": true
 
 			}
 
 		},
 
+    {
 
+			"path": "admin/home/result",
 
+			"style": {
 
+				"navigationBarTitleText": "",
 
+				"enablePullDownRefresh": true
 
+			}
 
+		},
 
 		{
 
 			"path": "admin/home/console",
 
 			"style": {

+ 7 - 6
ghsApp/src/pagesStorehouse/stockWarn/manage.vue
Просмотреть файл 

@@ -1,9 +1,7 @@
 
 <template>
 
 	<view class="billing_box_bg">
 
+    <app-tabs :tabs="tabs" :currentTab="tabIndex" @change="change" itemWidth="50%"/>
 
     <view class="input-wrap">
 
-			<view v-if="loginInfo.super" class="city-select text-line">
 
-				<DorpdownSelect :menuObj.sync="menuObj" :selectItemId.sync="shopId" top="0" @selectSussess="selectSussess"></DorpdownSelect>
 
-			</view>
 
 			<view class="search-bar">
 
 				<app-search-module
 
 					v-model="py"
 
@@ -11,8 +9,11 @@
 
 					@search="searchFn"
 
 				/>
 
 			</view>
 
+      <view v-if="loginInfo.super" class="city-select text-line">
 
+				<DorpdownSelect :menuObj.sync="menuObj" :selectItemId.sync="shopId" top="0" @selectSussess="selectSussess"></DorpdownSelect>
 
+			</view>
 
 		</view>
 
-		<app-tabs :tabs="tabs" :currentTab="tabIndex" @change="change" itemWidth="50%"/>
 
+		
 		<view v-if="tabs[tabIndex].name=='库存预警'" class="scroll-middle_bx">
 
 			<!--内容部分 start -->
 
 			<!--内容部分 start -->
 
@@ -195,8 +196,8 @@ export default {
 
 			display: flex;
 
 			flex-shrink: 0;
 
 			align-items: center;
 
-			margin-right: 45upx;
 
-			margin-left: 15px;
 
+			margin-right: 15upx;
 
+			margin-left: 45px;
 
 			background-color: #ffff;
 
 			.iconfont {
 
 				margin-left: 20upx;

+ 1 - 1
hdApp/src/admin/home/apply.vue
Просмотреть файл 

@@ -30,7 +30,7 @@
 
       </view>
 
     </view>
 
     <kd-entrance></kd-entrance>
 
-    <none-hd :show="AUTHORITY_SHOW" title="您还没有网店哦" btnText="免费申请" @bthClick="toFreeApply_HOME" :authShow="true"></none-hd>
 
+    <none-hd :show="AUTHORITY_SHOW" :title="MODEL_TITLE" :btnText="MODEL_BTN_TEXT" @bthClick="toFreeApply_HOME" :authShow="true" experienceFun></none-hd>
 
   </view>
 
 </template>

+ 12 - 7
hdApp/src/admin/home/me.vue
Просмотреть файл 

@@ -133,6 +133,7 @@
 
       @selectSussess="selectSussess"
 
     ></DorpdownSelect>
 
     <kd-entrance></kd-entrance>
 
+    <none-hd :show="AUTHORITY_SHOW" :title="MODEL_TITLE" :btnText="MODEL_BTN_TEXT" @bthClick="toFreeApply_HOME" :authShow="true" experienceFun></none-hd>
 
   </view>
 
 </template>
 
 
@@ -146,6 +147,7 @@ import { selectShop } from "@/mixins";
 
 import { getUser } from "@/utils/auth";
 
 import { list } from "@/mixins";
 
 import { mapGetters } from "vuex";
 
+import noneHd from "@/components/none-hd";
 
 export default {
 
   // 我的
 
   name: "Me",
 
@@ -153,6 +155,7 @@ export default {
 
     AppAvatarModule,
 
     TuiListCell,
 
     DorpdownSelect,
 
+    noneHd
 
   },
 
   mixins: [selectShop, list],
 
   computed: {
 
@@ -176,13 +179,15 @@ export default {
 
       this.$refs.dorpdownSelect.dropdownShow = true;
 
     },
 
     async init () {
 
-      try {
 
-        const { data } = await mainMy();
 
-        this.infoData = data;
 
-        //不要删除此输出，方法查看 shish 20210512
 
-        console.log('商家ID',data.sjId,'门店ID',data.shopId)
 
-        uni.stopPullDownRefresh();
 
-      } finally {
 
+      if(!this.AUTHORITY_SHOW) {
 
+        try {
 
+          const { data } = await mainMy();
 
+          this.infoData = data;
 
+          //不要删除此输出，方法查看 shish 20210512
 
+          console.log('商家ID',data.sjId,'门店ID',data.shopId)
 
+          uni.stopPullDownRefresh();
 
+        } finally {
 
+        }
 
       }
 
     },
 
     async selectSussess () {

+ 4 - 2
hdApp/src/admin/home/member.vue
Просмотреть файл 

@@ -54,7 +54,7 @@
 
       <app-wrapper-empty :is-empty="$util.isEmpty(list.data)" />
 
     </block>
 
     <kd-entrance></kd-entrance>
 
-    <none-hd :show="AUTHORITY_SHOW" title="您还没有网店哦" btnText="免费申请" @bthClick="toFreeApply_HOME" :authShow="true"></none-hd>
 
+    <none-hd :show="AUTHORITY_SHOW" :title="MODEL_TITLE" :btnText="MODEL_BTN_TEXT" @bthClick="toFreeApply_HOME" :authShow="true" experienceFun></none-hd>
 
   </div>
 
 </template>
 
 
@@ -104,7 +104,9 @@ export default {
 
   },
 
   methods: {
 
     init() {
 
-      this._list();
 
+      if(!this.AUTHORITY_SHOW) {
 
+        this._list();
 
+      }
 
     },
 
     // 列表
 
     _list() {

+ 4 - 2
hdApp/src/admin/home/order.vue
Просмотреть файл 

@@ -154,7 +154,7 @@
 
       </template>
 
     </modal-module>
 
     <kd-entrance></kd-entrance>
 
-    <none-hd :show="AUTHORITY_SHOW" title="您还没有网店哦" btnText="免费申请" @bthClick="toFreeApply_HOME" :authShow="true"></none-hd>
 
+    <none-hd :show="AUTHORITY_SHOW" :title="MODEL_TITLE" :btnText="MODEL_BTN_TEXT" @bthClick="toFreeApply_HOME" :authShow="true" experienceFun></none-hd>
 
   </div>
 
 </template>
 
 
@@ -248,7 +248,9 @@ export default {
 
   },
 
   methods: {
 
     init () {
 
-      this._list();
 
+      if(!this.AUTHORITY_SHOW) {
 
+        this._list();
 
+      }
 
     },
 
     _list () {
 
       let status = JSON.parse(JSON.stringify(this.tabIndex));

+ 48 - 0
hdApp/src/admin/home/result.vue
Просмотреть файл 

@@ -0,0 +1,48 @@
 
+<template>
 
+<!-- icondaizhifu -->
 
+	<appResult :title="status == '2' ? '审核中' : '审核通过'" :icon="status == '2' ? 'icondaizhifu' : 'iconchenggong'">
 
+		<button class="admin-button-com blue big" v-if="status != '2'" @click="loginSys">登录后台</button>
 
+		<button class="admin-button-com big" @click="openInform">开启通知</button>
 
+	</appResult>
 
+</template>
 
+
 
+<script>
 
+import appResult from "@/components/app-result";
 
+export default {
 
+	name: "BillingResult", // 开单结果
 
+  data(){
 
+    return {
 
+      status: '1'
 
+    }
 
+    
+  },
 
+	components: {
 
+		appResult
 
+	},
 
+  onLoad(option){
 
+    this.status = option.status
 
+  },
 
+	methods: {
 
+    loginSys(){
 
+      uni.setStorageSync('OPEN_SHOP_ID', '3')
 
+      this.$util.pageTo({
 
+        url: '/admin/home/workbench',
 
+        type: 4
 
+      })
 
+    },
 
+    openInform(){
 
+      this.pageTo({
 
+        url: '/pagesClient/official/warn',
 
+        type: 2
 
+      })
 
+    }
 
+	}
 
+};
 
+</script>
 
+
 
+<style lang="scss" scoped>
 
+.admin-button-com {
 
+	margin-bottom: 20px;
 
+	width: 100%;
 
+}
 
+</style>

+ 7 - 1
hdApp/src/admin/home/workbench.vue
Просмотреть файл 

@@ -129,6 +129,7 @@
 
         </div>
 
       </template>
 
     </modal-module>
 
+    <none-hd :show="AUTHORITY_SHOW" :title="MODEL_TITLE" :btnText="MODEL_BTN_TEXT" @bthClick="toFreeApply_HOME" :authShow="true" @experienceClick="experienceFun"></none-hd>
 
   </div>
 
 </template>
 
 
@@ -141,12 +142,14 @@ import { getDataTimestamp } from "@/utils/common";
 
 import { getWeixinId } from "@/api/invite/index";
 
 import { getUser } from "@/utils/auth";
 
 import { consoleIndex } from "@/api/workbench";
 
+import noneHd from "@/components/none-hd";
 
 export default {
 
   name: "admin-workbench",
 
   components: {
 
     ModalModule,
 
     FabModule,
 
     AppAvatarModule,
 
+    noneHd
 
   },
 
   // mixins:[share],
 
   data () {
 
@@ -298,7 +301,10 @@ export default {
 
       this.$util.pageTo(item)
 
     },
 
     init () {
 
-					getWeixinId().then(res => {
 
+      this._init()
 
+    },
 
+    _init(){
 
+      getWeixinId().then(res => {
 
 						this.getappIdList = res.data
 
 					});
 
 					getUser().then(res => {

+ 4 - 1
hdApp/src/components/app-result.vue
Просмотреть файл 

@@ -63,11 +63,14 @@ export default {
 
 			font-size: 170px;
 
 			color: $mainColor1;
 
 		}
 
+    .icondaizhifu {
 
+			font-size: 170px;
 
+			color: #ffa92e;
 
+		}
 
 		.result-title {
 
 			margin: 50px 0 70px;
 
 			font-size: 32px;
 
 		}
 
 	}
 
-	
 }
 
 </style>

+ 6 - 3
hdApp/src/components/none-hd.vue
Просмотреть файл 

@@ -6,7 +6,7 @@
 
     ></image>
 
     <view class="no_data_text">{{title}}</view>
 
     <view class="freeApply" @click="apply">{{btnText}}</view>
 
-    <view class="experience" v-if="authShow">体验</view>
 
+    <view class="experience" v-if="authShow" @click="experienceClick">体验</view>
 
   </view>
 
 </template>
 
 
@@ -19,11 +19,11 @@ export default {
 
     },
 
     btnText: {
 
       type: String,
 
-      default: '222',
 
+      default: '',
 
     },
 
     title: {
 
       type: String,
 
-      default: '111',
 
+      default: '',
 
     },
 
     authShow: {
 
       type: Boolean,
 
@@ -39,6 +39,9 @@ export default {
 
     apply() {
 
       this.$emit('bthClick')
 
     },
 
+    experienceClick(){
 
+      this.$emit('experienceClick')
 
+    }
 
   },
 
 };
 
 </script>

+ 112 - 18
hdApp/src/mixins/globalMixins.js
Просмотреть файл 

@@ -1,6 +1,8 @@
 
 import { mapGetters,mapActions } from 'vuex'
 
 import { pageTo, getCheckLogin, isLogin } from '@/utils/util.js'
 
 import { getUser, wxLoginFn } from '@/utils/auth'
 
+import { postWxCode, getDictionaries } from '@/api/mini'
 
+import { getStaffApi } from '@/api/common'
 
 import constant from '@/constant'
 
 export default {
 
 	data() {
 
@@ -14,12 +16,14 @@ export default {
 
 			// 全局混入，插入全局跳转函数
 
       pageTo: pageTo,
 
       AUTHORITY_SHOW: false,
 
-      shopAdminId: null
 
+      shopAdminId: null,
 
+      MODEL_TITLE: '您还没有网店哦',
 
+      MODEL_BTN_TEXT: '免费申请'
 
 		}
 
 	},
 
 	computed: {
 
 		...mapGetters({ loginInfo: "getLoginInfo" }),
 
-		...mapGetters(["getLoginInfo"])
 
+    ...mapGetters(["getLoginInfo", 'userInfo'])
 
 	},
 
 	// 页面生命周期才触发
 
   onLoad: function (option) {
 
@@ -32,8 +36,12 @@ export default {
 
 			uni.setStorageSync('account', option.account)
 
 		}
 
     uni.setStorageSync('currentQuery', JSON.stringify(option))
 
-    console.log(uni.getStorageSync('SHOPADMINID'),'this.shopAdminId')
 
-    if (uni.getStorageSync('SHOPADMINID') == '0') {
 
+    console.log(uni.getStorageSync('SHOP_ADMIN_STROAGE_SHOW'),'this.shopAdminId', this.getLoginInfo, this.getLoginInfo.openShop)
 
+    if (uni.getStorageSync('SHOP_ADMIN_STROAGE_SHOW') == '0') {
 
+      this.AUTHORITY_SHOW = true
 
+    } else if (this.getLoginInfo.openShop == '2') {
 
+      this.MODEL_TITLE = '已申请'
 
+      this.MODEL_BTN_TEXT = '查看申请进度'
 
       this.AUTHORITY_SHOW = true
 
     }
 
     if (this.$util.isEmpty(this.getLoginInfo)) {
 
@@ -49,12 +57,16 @@ export default {
 
         })
 
         if (needRedirect === true) {
 
           //客户访问不能查看的页面跳转去官网
 
-          if (res.data.shopAdminId == '0') {
 
+          console.log('res.data.damin', res.data.admin.openShop)
 
+          if (res.data.shopAdminId == '0' && res.data.admin.openShop == '1') {
 
             this.AUTHORITY_SHOW = true;
 
-            uni.setStorageSync('SHOPADMINID', res.data.shopAdminId)
 
-            this.shopAdminId = true;
 
-          } else {
 
-            uni.removeStorageSync('SHOPADMINID')
 
+            uni.setStorageSync('SHOP_ADMIN_STROAGE_SHOW', res.data.shopAdminId)
 
+          } else if (res.data.admin.openShop == '2' && res.data.shopAdminId == '0') {
 
+            this.MODEL_TITLE = '已申请'
 
+            this.MODEL_BTN_TEXT = '查看申请进度'
 
+            this.AUTHORITY_SHOW = true
 
+            uni.removeStorageSync('SHOP_ADMIN_STROAGE_SHOW')
 
+            uni.setStorageSync('OPEN_SHOP_ID', res.data.admin.openShop)
 
           }
 
         }
 
         getUser(true)
 
@@ -71,20 +83,102 @@ export default {
 
 		if (isLogin()) {
 
 			if (this.init) {
 
 				this.init()
 
-			}
 
+      }
 
 		}
 
 	},
 
 	methods: {
 
     ...mapActions(['setUserShopAll']),
 
     toFreeApply_HOME () {
 
-      	this.$util.pageTo({
 
-      		url: "/pagesClient/official/index",
 
-      		type: 2,
 
-      		query: {
 
-      			...this.option
 
-      		}
 
-      	});
 
-    }
 
+      let status = ''
 
+        if (uni.getStorageSync('SHOP_ADMIN_STROAGE_SHOW') == '0') {
 
+          this.$util.pageTo({
 
+            url: "/pagesClient/official/index",
 
+            type: 2,
 
+            query: {
 
+              ...this.option
 
+            }
 
+          });
 
+        } else {
 
+          getStaffApi().then(res => {
 
+            console.log(res)
 
+            if (res.data.openShop == '2') {
 
+              status = '2'
 
+            } else if (res.data.openShop == '3') {
 
+              status = '3'
 
+            }
 
+            this.$util.pageTo({
 
+              url: '/admin/home/result',
 
+              type: 2,
 
+              query: {
 
+                status
 
+              }
 
+            })
 
+          }).catch(err => {})
 
+          // this.$util.pageTo({
 
+          //   url: '/admin/home/result',
 
+          //   type: 2,
 
+          //   query: {
 
+          //     status: '2'
 
+          //   }
 
+          // })
 
+      }
 
+    },
 
+    experienceFun(){
 
+      /**姜枫 2021.04.30  小程序审核体验账号**/
 
+      postWxCode().then(subRes => {
 
+        if (this.$util.isEmpty(subRes)) {
 
+          return false
 
+        }
 
+        uni.setStorageSync('token', subRes.data.token)
 
+        uni.setStorageSync('shopId', subRes.data.admin.currentShopId)
 
+        getDictionaries({ token: subRes.data.token }).then(res => {
 
+          if (this.$util.isEmpty(res)) {
 
+            return false
 
+          }
 
+          this.$store.commit('setDictionariesInfo', {
 
+            ...res.data.dict,
 
+            ...res.data
 
+          })
 
+          this.$store.commit('setMyShopInfo', {
 
+            ...res.data.shop,
 
+            ...res.data
 
+          })
 
+        })
 
+        this.$store.commit('setLoginInfo', {
 
+          ...subRes.data.admin,
 
+          ...subRes.data
 
+        })
 
+        uni.removeStorageSync('SHOP_ADMIN_STROAGE_SHOW')
 
+        uni.removeStorageSync('OPEN_SHOP_ID')
 
+        this.AUTHORITY_SHOW = false
 
+        //启动更新逻辑 shish 2020.5.18
 
+        if (subRes.data.update == 1) {
 
+          const updateManager = wx.getUpdateManager()
 
+          updateManager.onCheckForUpdate(function (res) {
 
+            // 请求完新版本信息的回调
 
+            console.log(res.hasUpdate)
 
+          })
 
+          updateManager.onUpdateReady(function () {
 
+            wx.showModal({
 
+              title: '更新提示',
 
+              content: '新版本已经准备好，是否重启应用？',
 
+              success(res) {
 
+                if (res.confirm) {
 
+                  // 新的版本已经下载好，调用 applyUpdate 应用新版本并重启
 
+                  updateManager.applyUpdate()
 
+                }
 
+              }
 
+            })
 
+          })
 
+          updateManager.onUpdateFailed(function () {})// 新版本下载失败
 
+          return true;
 
+        }
 
+        getUser(true)
 
+        //获取门店信息
 
+        this.setUserShopAll();
 
+        uni.switchTab({url:'/admin/home/workbench'})
 
+      })
 
+    },
 
 	},
 
 	mounted() {
 
 		if (this.mInit) {

+ 7 - 0
hdApp/src/pages.json
Просмотреть файл 

@@ -7,6 +7,13 @@
 
 				"enablePullDownRefresh": true
 
 			}
 
 		},
 
+    {
 
+			"path": "admin/home/result",
 
+			"style": {
 
+				"navigationBarTitleText": "",
 
+				"enablePullDownRefresh": true
 
+			}
 
+		},
 
     {
 
 			"path": "admin/home/newStudent",
 
 			"style": {

+ 1 - 1
hdApp/src/pagesClient/official/apply.vue
Просмотреть файл 

@@ -237,7 +237,7 @@ export default {
 
             pagestatus: 3,
 
           },
 
         });
 
-      });
 
+      }).catch(err => {});
 
     },
 
     // 选择地址
 
     selRegionFn() {

+ 6 - 6
hdApp/src/pagesStorehouse/stockWarn/manage.vue
Просмотреть файл 

@@ -1,9 +1,7 @@
 
 <template>
 
 	<view class="billing_box_bg">
 
+    <app-tabs :tabs="tabs" :currentTab="tabIndex" @change="change" itemWidth="50%"/>
 
     <view class="input-wrap">
 
-			<view v-if="loginInfo.switchShop" class="city-select text-line">
 
-				<DorpdownSelect :menuObj.sync="menuObj" :selectItemId.sync="shopId" top="0" @selectSussess="selectSussess"></DorpdownSelect>
 
-			</view>
 
 			<view class="search-bar">
 
 				<app-search-module
 
 					v-model="py"
 
@@ -11,8 +9,10 @@
 
 					@search="searchFn"
 
 				/>
 
 			</view>
 
+      <view v-if="loginInfo.switchShop" class="city-select text-line">
 
+				<DorpdownSelect :menuObj.sync="menuObj" :selectItemId.sync="shopId" top="0" @selectSussess="selectSussess"></DorpdownSelect>
 
+			</view>
 
 		</view>
 
-		<app-tabs :tabs="tabs" :currentTab="tabIndex" @change="change" itemWidth="50%"/>
 
 		<view v-if="tabs[tabIndex].name=='库存预警'" class="scroll-middle_bx">
 
 			<!--内容部分 start -->
 
 			<!--内容部分 start -->
 
@@ -199,8 +199,8 @@ export default {
 
 			display: flex;
 
 			flex-shrink: 0;
 
 			align-items: center;
 
-			margin-right: 45upx;
 
-			margin-left: 15px;
 
+			margin-right: 15upx;
 
+			margin-left: 45px;
 
 			background-color: #ffff;
 
 			.iconfont {
 
 				margin-left: 20upx;

+ 5 - 4
mallApp/src/pages/pay/index.vue
Просмотреть файл 

@@ -131,8 +131,8 @@
 
 		mounted() {},
 
 		methods: {
 
 			isWxMiniapp(){
 
-        		return isWxMiniapp()
 
-      		},
 
+        return isWxMiniapp()
 
+      },
 
 			specialInit() {
 
 				// #ifdef H5
 
 				// 微信二次分享
 
@@ -146,6 +146,7 @@
 
 					this.tabIndex = parseInt(this.option.pageType)
 
 				}
 
 				getOrderShop().then(res => {
 
+				  console.log(res,'getOrderShop')
 
 					this.inpFocus = true
 
 					uni.setNavigationBarTitle({
 
 						title: `您正在向【${res.shop.merchantName} ${res.shop.shopName}】付款`
 
@@ -161,10 +162,10 @@
 
 						desc: '享随机优惠，最高20元', // 分享内容
 
 						imgUrl: `${this.$constant.imgUrl}/retail/pay.jpg`,
 
 						// #ifdef H5
 
-						pagePath: `${this.$constant.formal}/#/pages/pay/index?account=${res.merchantId}&store=0&sourceType=3`,
 
+						pagePath: `${this.$constant.formal}/#/pages/pay/index?account=${res.shop.id}&store=0&sourceType=3`,
 
 						// #endif
 
 						// #ifndef H5
 
-						pagePath: `/pages/pay/index?account=${res.merchantId}&store=0&sourceType=3`
 
+						pagePath: `/pages/pay/index?account=${res.shop.id}&store=0&sourceType=3`
 
 						// #endif
 
 					}
 
 					this.jweixinFn(shareParams)

Некоторые файлы не были показаны из-за большого количества измененных файлов