shish 4 лет назад
Родитель
Сommit
e975f2d7e8

+ 1 - 3
hdApp/src/admin/billing/affirmGhs.vue

@@ -562,9 +562,7 @@ export default {
 			}
 		},
 		gobackEvent() {
-			uni.navigateBack({
-				delta: 1
-			});
+			this.$util.pageTo({url: "/pagesPurchase/ghsProduct",query: {id:this.options.id},type: 2})
 		}
 	}
 };

+ 3 - 5
hdApp/src/pagesPurchase/ghsProduct.vue

@@ -23,7 +23,7 @@
 			</view>
 
         </view>
-		<i class="iconfont icondianhua1" v-if="ghsInfo.mobile !=''" @tap="toPhone(ghsInfo.mobile)"></i>
+		<i class="iconfont icondianhua1" style="font-size:50upx;color:#6da3f5;position:absolute;top:45upx;" v-if="ghsInfo.mobile !=''" @tap="toPhone(ghsInfo.mobile)"></i>
 		<image v-if="tjFl == 1" class="hbImg" :src="`${constant.imgUrl}/icon/hb128.png`" mode="widthFix" @click="invite()"></image>
         <view v-if="tjFl == 1" class="hbInfo" @click="invite()">邀请得红包</view>
       </view>
@@ -273,7 +273,6 @@ export default {
 	onLoad() {
 	},
 	onUnload() {
-		this.resetSelectInfoByType(this.pageType)
 	},
 	onShareAppMessage(res) {
 
@@ -542,9 +541,8 @@ export default {
 				}
 				this.setSelectInfoByType({ type: this.pageType, info: list });
 
-				uni.navigateTo({
-					url: `/admin/billing/affirmGhs?id=${this.options.id}`
-				});
+				this.pageTo({url: '/admin/billing/affirmGhs',query:{id:this.options.id},type: 2})
+
 			} else {
 				this.$msg("请选择花材");
 			}

+ 6 - 15
hdApp/src/pagesPurchase/order.vue

@@ -3,13 +3,7 @@
     <view class="order_list">
       <block>
         <block v-if="!$util.isEmpty(supplierList)">
-          <view
-            class="list_item"
-            v-for="(item, index) in supplierList"
-            :key="index"
-            @click="enter(item)"
-          >
-            <view class="dist">{{item.dist}}</view>
+          <view class="list_item" v-for="(item, index) in supplierList" :key="index" @click="enterShop(item)" >
             <view class="store_name">
               <image :src="item.avatar"></image>
               <view class="store_title">{{item.name}}</view>
@@ -31,10 +25,7 @@
           </view>
         </block>
         <block v-else>
-          <AppWrapperEmpty
-            title="暂无数据"
-            :is-empty="$util.isEmpty(supplierList)"
-          />
+          <AppWrapperEmpty title="暂无数据" :is-empty="$util.isEmpty(supplierList)" />
         </block>
       </block>
     </view>
@@ -105,9 +96,9 @@ export default {
         url: '/pagesInvite/inviteShop'
       })
 		},
-    enter (item) {
+    enterShop(item) {
       const { id } = item
-			uni.navigateTo({url:`/pagesPurchase/ghsProduct?id=${id}`, type: 2 })
+      this.pageTo({url: '/pagesPurchase/ghsProduct',query:{id:id},type: 2})
     },
     init() {
       this.getGHSList()
@@ -231,12 +222,12 @@ export default {
       }
       & > .store_btn {
         position: absolute;
-        top:155upx;
+        top:140upx;
         left: 0upx;
         & > .btn_entrance {
           display: inline-block;
           font-size: 26upx;
-          color: #CCCCCC;
+          color: #666666;
           padding: 10upx 20upx;
           margin-left: 20upx;
           text-decoration:underline;