shish 3 лет назад
Родитель
Сommit
1f3dff9b66

+ 4 - 0
hdApp/src/admin/home/workbench.vue

@@ -99,6 +99,10 @@
     <button class="admin-button-com mini-btn blue" style="margin-left:13upx;padding-top:17upx;padding-bottom:17upx;" @click="pageTo({url:'/pagesPurchase/open'})">开启零售功能</button>
   </view>
 
+  <view style="text-align:center;" @click.stop="pageTo({url:'/admin/ljh/info'})">
+    <image :src="`${constant.imgUrl}/ljh/banner.jpg`" mode="widthFix" style="width:97%;margin:0 auto;"></image>
+  </view>
+
   <template v-if="!$util.isEmpty(supplierList)">
 
     <view class="ghs_list_area flex-col justify-end">

+ 0 - 8
hdApp/src/admin/ljh/confirm.vue

@@ -52,14 +52,6 @@
         </view>
       </view>
 
-      <view style="color:#999999;font-size:25upx;margin-top:30upx;margin-left:50upx;">
-        <radio-group @change="agreeItem">
-          <label>
-            <radio value="1" style="width:6upx;transform:scale(0.6)" checked />
-            <text style="margin-left:38upx;">领取免费商城</text>
-          </label>
-        </radio-group>
-      </view>
       <div class="btn-wrap">
         <button class="admin-button-com blue big" formType="submit" >提交</button>
       </div>

+ 12 - 3
hdApp/src/admin/ljh/confirmPay.vue

@@ -32,7 +32,6 @@ import { applyWxPay,getDetail } from "@/api/ljh";
 import { mapGetters } from "vuex";
 import wexinPay from "@/utils/pay/wxPay";
 import { postWxCode } from '@/api/mini'
-import { updateMiniOpenId } from '@/api/admin'
 export default {
   name: "confirmPay",
   components: {
@@ -82,14 +81,24 @@ export default {
                   uni.setStorageSync('code', res.code)
                   postWxCode({ code: res.code }).then(subRes => {
                     if(subRes.data.currentMiniOpenId){
-                      let currentMiniOpenId = subRes.data.currentMiniOpenId
-                      updateMiniOpenId({miniOpenId:currentMiniOpenId}).then(subRes=>{
+                        let currentMiniOpenId = subRes.data.currentMiniOpenId
+                        uni.setStorageSync('currentMiniOpenId', currentMiniOpenId)
                         if(subRes.code == 1){
                             that.$util.confirmModal({content:'网络开小差了,请继续',okText:'确认',singer:true},() => {
                               that.wxPayFn()
                             })
                         }
+                    }else{
+
+                      that.$util.confirmModal({content:'出错了,请添加客服微信反馈',okText:'复制微信'},() => {
+                        uni.setClipboardData({
+                          data: '15280215347',
+                          success: function() {
+                            that.$msg("复制成功")
+                          }
+                        })
                       })
+
                     }
                   })
                 }

+ 2 - 1
hdApp/src/mixins/globalMixins.js

@@ -42,7 +42,8 @@ export default {
 			let currentRoute  = pages[pages.length-1].route;
 			if(this.$util.isEmpty(token)){
 				//首页、花店采购页、欠款单列表页、结账单详情页、花材详情页
-				if(currentRoute == 'admin/home/workbench' || currentRoute == 'pagesPurchase/ghsProduct' || currentRoute == 'pagesPurchase/gathering' || currentRoute == 'admin/clear/info' || currentRoute == 'pagesPurchase/purDetails' || currentRoute == 'admin/ghsProduct/detail'){
+				if(currentRoute == 'admin/home/workbench' || currentRoute == 'pagesPurchase/ghsProduct' || currentRoute == 'pagesPurchase/gathering' || currentRoute == 'admin/clear/info' || currentRoute == 'pagesPurchase/purDetails' || 
+				currentRoute == 'admin/ghsProduct/detail' || currentRoute == 'admin/ljh/info'){
 					wxLoginFn(true).then(res => {
 						let token = res.data.token || ''
 						//用于开启小程序自动登录

+ 3 - 0
hdApp/src/pagesPurchase/order.vue

@@ -7,6 +7,9 @@
       <button class="admin-button-com mini-btn blue" style="margin-left:13upx;padding-top:17upx;padding-bottom:17upx;" @click="pageTo({url:'/pagesPurchase/pb'})">已屏蔽列表</button>
       <button class="admin-button-com mini-btn blue" style="margin-left:13upx;padding-top:17upx;padding-bottom:17upx;" @click="pageTo({url:'/pagesPurchase/open'})">开启零售功能</button>
     </view>
+    <view style="text-align:center;" @click.stop="pageTo({url:'/admin/ljh/info'})">
+      <image :src="`${constant.imgUrl}/ljh/banner.jpg`" mode="widthFix" style="width:97%;margin:0 auto;"></image>
+    </view>
 
 <template v-if="!$util.isEmpty(supplierList)">