shish 3 years ago
parent
commit
53e0133565

+ 2 - 2
hdApp/src/admin/home/workbench.vue

@@ -128,8 +128,8 @@
 
   <view style="background-color:white;margin-bottom:20upx;">
     <button class="admin-button-com mini-btn blue" style="margin-left:12upx;padding-top:17upx;padding-bottom:17upx;" @click="pageTo({url:'/admin/shop/myShop'})">我的门店</button>
-    <button class="admin-button-com mini-btn blue" style="margin-left:12upx;padding-top:17upx;padding-bottom:17upx;" @click="pageTo({url:'/admin/staff/list'})">添加员工</button>
-    <button class="admin-button-com mini-btn blue" style="margin-left:12upx;padding-top:17upx;padding-bottom:17upx;" @click="pageTo({url:'/admin/shop/add?id='+loginInfo.shopId})">修改地址</button>
+    <button class="admin-button-com mini-btn blue" style="margin-left:12upx;padding-top:17upx;padding-bottom:17upx;" @click="pageTo({url:'/admin/staff/list'})">我的员工</button>
+    <button class="admin-button-com mini-btn blue" style="margin-left:12upx;padding-top:17upx;padding-bottom:17upx;" @click="pageTo({url:'/admin/shop/add?id='+loginInfo.shopId})">我的地址</button>
     <button class="admin-button-com mini-btn blue" style="margin-left:12upx;padding-top:17upx;padding-bottom:17upx;" @click="pageTo({url:'/admin/stat/cgItem'})">采购统计</button>
     <button class="admin-button-com mini-btn blue" style="margin-left:12upx;padding-top:17upx;padding-bottom:17upx;" @click="goMore()">更多</button>
   </view>

+ 0 - 6
hdApp/src/pagesPurchase/gatherPay.vue

@@ -100,26 +100,20 @@ export default {
     },
     getSuccess () {
       let that = this
-      // #ifdef APP-PLUS
       that.pageTo({ url: '/pagesPurchase/gatherResult', type: 2 })
-      // #endif
       // #ifdef MP-WEIXIN
       if(this.getDictionariesInfo && this.getDictionariesInfo.subscribeMessage && this.getDictionariesInfo.subscribeMessage == 1 && this.getDictionariesInfo.hdMiniMessage && this.getDictionariesInfo.hdMiniMessage.cgSuccess && this.getDictionariesInfo.hdMiniMessage.remindHdClear && this.getDictionariesInfo.hdMiniMessage.giveCoupon){
         uni.requestSubscribeMessage({
           tmplIds: [this.getDictionariesInfo.hdMiniMessage.cgSuccess.msgId,this.getDictionariesInfo.hdMiniMessage.giveCoupon.msgId,this.getDictionariesInfo.hdMiniMessage.remindHdClear.msgId],
           success(res) {
             console.log(res)
-            that.pageTo({ url: '/pagesPurchase/gatherResult', type: 2 })
           },
           fail(err) {
             console.log(err)
           },
           complete() {
-
           }
         })
-      }else{
-        that.pageTo({ url: '/pagesPurchase/gatherResult', type: 2 })
       }
       // #endif
     },

+ 0 - 5
hdApp/src/pagesPurchase/wechatPay.vue

@@ -188,16 +188,13 @@ export default {
     },
     getSuccess () {
       let that = this
-      // #ifdef APP-PLUS
       that.pageTo({ url: '/pagesPurchase/particulars?id=' + that.pageId, type: 2 })
-      // #endif
       // #ifdef MP-WEIXIN
       if(this.getDictionariesInfo && this.getDictionariesInfo.subscribeMessage && this.getDictionariesInfo.subscribeMessage == 1 && this.getDictionariesInfo.hdMiniMessage && this.getDictionariesInfo.hdMiniMessage.cgSuccess && this.getDictionariesInfo.hdMiniMessage.remindHdClear && this.getDictionariesInfo.hdMiniMessage.giveCoupon){
         uni.requestSubscribeMessage({
           tmplIds: [this.getDictionariesInfo.hdMiniMessage.cgSuccess.msgId,this.getDictionariesInfo.hdMiniMessage.giveCoupon.msgId,this.getDictionariesInfo.hdMiniMessage.remindHdClear.msgId],
           success(res) {
             console.log(res)
-            that.pageTo({ url: '/pagesPurchase/particulars?id=' + that.pageId, type: 2 })
           },
           fail(err) {
             console.log(err)
@@ -206,8 +203,6 @@ export default {
 
           }
         })
-      }else{
-        that.pageTo({ url: '/pagesPurchase/particulars?id=' + that.pageId, type: 2 })
       }
       // #endif
     },