更新优化

hdApp/src/pagesPurchase/components/item.vue

@@ -30,7 +30,8 @@
 						</block>
 					</view>
 					<view class="price" v-if="info.myLevel && info.myLevel == 2">
-						<text style="color:#a7a2a2;text-decoration:line-through;font-size:30upx;font-weight:bold;">￥{{parseFloat(info.defaultGradePrice) }}</text>
+						<!--平潭满天星，不展示原价，比较特殊-->
+						<text style="color:#a7a2a2;text-decoration:line-through;font-size:30upx;font-weight:bold;" v-if="Number(shopId)!=38322">￥{{parseFloat(info.defaultGradePrice) }}</text>
 						<text style="font-weight:bold;margin-left:10upx;font-size:30upx;">会员￥{{ parseFloat(info.price) }}</text>
 					</view>
 					<view class="price" style="font-weight:bold;font-size:30upx;" v-else>￥{{ info.price ? parseFloat(info.price) : 0 }}</view>
@@ -83,6 +84,10 @@ export default {
 			type: Number,
 			default: 0
 		},
+		shopId:{
+			type: Number,
+			default: 0
+		},
 		showStock:{
 			type: String,
 			default: '0'

hdApp/src/pagesPurchase/ghsProduct.vue

@@ -57,6 +57,7 @@
 									:discount.sync="ghsInfo.giveDiscount"
 									:showStock.sync="ghsInfo.showStock"
 									:showSold.sync="ghsInfo.showSold"
+									:shopId.sync="ghsInfo.shopId"
 									@customNum="customNum"
 									@add="addEvent"
 									@addOneEvent="addCustomNumEvent"

hdApp/src/pagesPurchase/order.vue

@@ -154,7 +154,7 @@
       
       <!-- 底部提示 -->
       <view class="supplier-notice-footer">
-        <text class="supplier-notice-tip">买花时注意区分，避免下错</text>
+        <text class="supplier-notice-tip">请注意区分，已经有很多个人，下到不是自己要的那家了</text>
         <view class="supplier-notice-buttons">
           <button class="admin-button-com default" @click="remindLater">下次提醒</button>
           <button class="admin-button-com blue" @click="closeSupplierNotice">知道了</button>
@@ -325,7 +325,6 @@ export default {
     },
     init() {
       this.getMyGhsData()
-      this.toRemindCustom()
     },
     toRemindCustom(){
       hasMoreGhs().then(ret=>{
@@ -338,6 +337,8 @@ export default {
       return ghsList().then(res => {
         this.supplierList = res.data.list
         this.ad = res.data.ad ? res.data.ad : []
+        //这个不能移到外面去，否则会有问题
+        this.toRemindCustom()
       })
     },
     settleAccounts (item) {