Merge branch 'master' of http://git.huaml.com/zhh/front-end

ghsApp/src/admin/home/workbench.vue

@@ -241,10 +241,9 @@ export default {
 					url: "/pagesStatistics/business"
 				},
 				{
-					name: "全部",
-					img: `${this.$constant.imgUrl}/ghs/home/qball.png`,
-					url: "/admin/home/apply",
-					type:4
+					name: "供货商",
+					img: `${this.$constant.imgUrl}/ghs/home/icon_ghs.png`,
+					url: "/pagesPurchase/supplier"
 				}
 			],
 			// 总览

ghsApp/src/pages.json

@@ -628,12 +628,19 @@
 					}
 				},
 				{
-					"path": "order",
+					"path": "order", 
 					"style": {
 						"navigationBarTitleText": "采购订单",
 						"enablePullDownRefresh": true
 					}
 				},
+        {
+					"path": "supplier",  
+					"style": {
+						"navigationBarTitleText": "供货商",
+						"enablePullDownRefresh": true
+					}
+				},
 				{
 					"path": "info",
 					"style": {

hdApp/src/admin/home/workbench.vue

@@ -129,7 +129,7 @@
         </div>
       </template>
     </modal-module>
-    <none-hd :show="AUTHORITY_SHOW" :title="MODEL_TITLE" :btnText="MODEL_BTN_TEXT" @bthClick="toFreeApply_HOME" :authShow="EXPER_AUTH_SHOW" @experienceClick="experienceFun"></none-hd>
+    <none-hd :show="AUTHORITY_SHOW" :title="MODEL_TITLE" :btnText="MODEL_BTN_TEXT" @bthClick="toFreeApply_HOME" :authShow="EXPER_AUTH_SHOW" @comfirm="experienceFun"></none-hd>
   </div>
 </template>
 
@@ -292,6 +292,10 @@ export default {
     uni.stopPullDownRefresh();
   },
   onShow () {
+    if(!this.$util.isEmpty(this.loginInfo) && this.loginInfo.shopAdminId == '0') {
+      this.AUTHORITY_SHOW = true
+      uni.hideTabBar()
+    }
   },
   methods: {
     goPage (item) {

hdApp/src/components/none-hd.vue

@@ -6,7 +6,18 @@
     ></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 class="experience" v-if="expreShow" @click="experienceClick">体验</view>
+    <view class="experFrame">
+      <view v-if="rightShow">
+        <input
+            v-model="experCode"
+            class="experInput"
+            placeholder="请输入体验码"
+          />
+        <!-- <input type="text"  v-model="experCode" placeholder="请输入体验码" /> -->
+        <text class="admin-button-com small blue" @click="rightClick">确定</text>
+      </view>
+    </view>
   </view>
 </template>
 
@@ -30,9 +41,17 @@ export default {
       default: false,
     }
   },
+  watch: {
+    authShow(val) {
+      this.expreShow = val
+    }
+  },
   data() {
     return {
       constant: this.$constant,
+      experCode: '',
+      expreShow: false,
+      rightShow: false
     };
   },
   methods: {
@@ -40,7 +59,11 @@ export default {
       this.$emit('bthClick')
     },
     experienceClick(){
-      this.$emit('experienceClick')
+      this.rightShow = true
+      this.expreShow = false
+    },
+    rightClick() {
+      this.$emit('comfirm', this.experCode)
     }
   },
 };
@@ -85,5 +108,34 @@ export default {
     color: #fff;
     font-size: 30upx;
   }
+  &>.experFrame{
+    margin-top: 50upx;
+    height: 50upx;
+    &>view{
+      margin: 0 auto;
+      &>.experInput{
+        height: 70upx;
+        width: 250upx;
+        display: inline-block;
+        vertical-align: middle;
+        border-radius: 8upx;
+        background-color: #fff;
+        border: 1px solid #ccc;
+        color: #666;
+        padding-left: 20upx;
+        box-sizing: border-box;
+        text-align: left;
+      }
+      &>text{
+        display: inline-block;
+        line-height: 70upx;
+        padding: 0 20upx;
+        background-color: #3385FF;
+        vertical-align: middle;
+        font-size: 30upx;
+        margin-left: 20upx;
+      }
+    }
+  }
 }
 </style>

hdApp/src/mixins/globalMixins.js

@@ -120,9 +120,14 @@ export default {
           }).catch(err => {})
       }
     },
-    experienceFun(){
+    experienceFun (val) {
+      console.log(val)
+      if (this.$util.isEmpty(val)) {
+        this.$msg('请输入体验码')
+        return false
+      }
       /**姜枫 2021.04.30  小程序审核体验账号**/
-      postWxCode().then(subRes => {
+      postWxCode({password: val}).then(subRes => {
         if (this.$util.isEmpty(subRes)) {
           return false
         }