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

+ 0 - 8
hdApp/src/admin/home/apply.vue

@@ -126,14 +126,6 @@ export default { // 应用页面
             },
             },
           ]
           ]
         },
         },
-        {
-          title: '赚钱分红',
-          list: [{
-            name: "邀请开店",
-            img: `${this.$constant.imgUrl}/ghs/home/yqyl.png`,
-            url: "/pagesInvite/list"
-          }]
-        },
         {
         {
           title: '数据统计',
           title: '数据统计',
           list: [
           list: [

+ 1 - 1
hdApp/src/pagesPurchase/components/wangCg.vue

@@ -2,7 +2,7 @@
   <view class="model" v-if="show">
   <view class="model" v-if="show">
     <image :src="`${constant.imgUrl}/ghs/home/deserve.png`" class="noData_img"></image>
     <image :src="`${constant.imgUrl}/ghs/home/deserve.png`" class="noData_img"></image>
     <view class="freeApply" @click="learnCg" style="margin:50rpx auto 50rpx auto">快速了解采购流程</view>
     <view class="freeApply" @click="learnCg" style="margin:50rpx auto 50rpx auto">快速了解采购流程</view>
-    <view class="freeApply" @click="apply">采购</view>
+    <view class="freeApply" @click="apply">开始采购</view>
   </view>
   </view>
 </template>
 </template>
 <script>
 <script>

+ 17 - 17
hdApp/src/pagesPurchase/ghsProduct.vue

@@ -280,7 +280,7 @@ export default {
 		}
 		}
 
 
 		//查看分享的路径,不要删除 shish 20210517
 		//查看分享的路径,不要删除 shish 20210517
-		console.log('share',`pagesPurchase/ghsProduct?hdShopAdminId=${this.loginInfo.shopAdminId}&ghsShopAdminId=${ghsShopAdminId}&shopId=${this.shopId}&id=0`)
+		console.log(`pagesPurchase/ghsProduct?hdShopAdminId=${this.loginInfo.shopAdminId}&ghsShopAdminId=${ghsShopAdminId}&shopId=${this.shopId}&id=0`)
 
 
 		return {
 		return {
 			title: this.ghsInfo.name,
 			title: this.ghsInfo.name,
@@ -345,6 +345,11 @@ export default {
 				if(sceneArray.id){
 				if(sceneArray.id){
 					this.option.id = sceneArray.id
 					this.option.id = sceneArray.id
 				}
 				}
+			}else{
+				if(this.option.hdShopAdminId || this.option.ghsShopAdminId){
+					this.ghsShopAdminId = this.option.ghsShopAdminId
+					this.hdShopAdminId = this.option.hdShopAdminId
+				}
 			}
 			}
 
 
 			const { shopId,id} = this.option;
 			const { shopId,id} = this.option;
@@ -354,18 +359,19 @@ export default {
 					this.ghsInfo = res.data
 					this.ghsInfo = res.data
 					let id = res.data.id
 					let id = res.data.id
 					this.ghsId = id
 					this.ghsId = id
-					this.visitMall(id)
 					//获取供货商花材
 					//获取供货商花材
-					this.initGhsData(id,shopId);					
-					this.createShareDiscount()
+					if(id>0){
+						this.visitMall(id)
+						this.initGhsData(id,shopId)
+						//不是新人或者已经下过单的或者活动没有开启不显示新人红包
+						if(this.ghsInfo.hasCg == 1 || this.ghsInfo.new == 0 || this.ghsInfo.xrFl == 0 || this.ghsInfo.sendNewGift == 1){
+							this.isNewCustom = false
+						}else{
+							this.isNewCustom = true
+						}
+					}
 					uni.setNavigationBarTitle({title: this.ghsInfo.name})
 					uni.setNavigationBarTitle({title: this.ghsInfo.name})
 					this.option.id = res.data.id;
 					this.option.id = res.data.id;
-					//不是新人或者已经下过单的或者活动没有开启不显示新人红包
-					if(this.ghsInfo.hasCg == 1 || this.ghsInfo.new == 0 || this.ghsInfo.xrFl == 0 || this.ghsInfo.sendNewGift == 1){
-						this.isNewCustom = false
-					}else{
-						this.isNewCustom = true
-					}
 				}).catch(err => {})
 				}).catch(err => {})
 			} else {
 			} else {
 				this.ghsId = this.option.id
 				this.ghsId = this.option.id
@@ -375,7 +381,6 @@ export default {
 					this.ghsInfo = res.data
 					this.ghsInfo = res.data
 					this.shopId = res.data.shopId
 					this.shopId = res.data.shopId
 					this.visitMall(this.option.id)
 					this.visitMall(this.option.id)
-					this.createShareDiscount()
 					uni.setNavigationBarTitle({title: this.ghsInfo.name})
 					uni.setNavigationBarTitle({title: this.ghsInfo.name})
 					//不是新人或者已经下过单的或者活动没有开启不显示新人红
 					//不是新人或者已经下过单的或者活动没有开启不显示新人红
 					if(this.ghsInfo.hasCg == 1 || this.ghsInfo.new == 0 || this.ghsInfo.xrFl == 0 || this.ghsInfo.sendNewGift == 1){
 					if(this.ghsInfo.hasCg == 1 || this.ghsInfo.new == 0 || this.ghsInfo.xrFl == 0 || this.ghsInfo.sendNewGift == 1){
@@ -385,16 +390,11 @@ export default {
 					}
 					}
 				}).catch(err => {})
 				}).catch(err => {})
 			}
 			}
-
 		},
 		},
 		visitMall(ghsId){
 		visitMall(ghsId){
-			//访问商城
+			//访客记录
 			visitMall({id:ghsId})
 			visitMall({id:ghsId})
 		},
 		},
-		createShareDiscount(){
-			let shareDiscount = this.ghsInfo.giveDiscount*100
-			this.shareDiscount = shareDiscount
-		},
 		scroll_detail(options){
 		scroll_detail(options){
 			if(options.detail.scrollTop > 20) {
 			if(options.detail.scrollTop > 20) {
 				this.myClass = 'fadeOut'
 				this.myClass = 'fadeOut'

+ 2 - 2
hdApp/src/pagesPurchase/order.vue

@@ -36,11 +36,11 @@
         </block>
         </block>
       </block>
       </block>
     </view>
     </view>
-
+    <!--
     <view class="app-footer open_btn">
     <view class="app-footer open_btn">
 			<view @click="inviteGhs" class="admin-button-com middle blue">邀请供应商得300元</view>
 			<view @click="inviteGhs" class="admin-button-com middle blue">邀请供应商得300元</view>
 		</view>
 		</view>
-
+    -->
   </view>
   </view>
 </template>
 </template>