pageB/follow/index.vue

@@ -5,7 +5,7 @@
             <text>输入达人名称</text>
         </view>
         <view class="list">
-            <darenItem style="margin-top:20rpx;margin-right:23rpx" v-for="item in recommendList" :key="item.id" :info="item"  v-on:pChangeType="changeType" ></darenItem>
+            <darenItem style="margin-top:20rpx;margin-right:23rpx" v-for="item in recommendList" :key="item.id" :info="item"  v-on:pChangeType="changeType"></darenItem>
         </view>
     </view>
 </template>
@@ -76,7 +76,7 @@ export default {
 		},
 		searchValue() {
 			uni.navigateTo({
-				url: '/pageB/search/index'
+				url: '/pageB/search/index?type=1'
 			})
 		},
 	},

pageB/sdetails/index.vue

@@ -443,15 +443,25 @@ export default {
 		* @params {Number} ifcart 结算方式 1:购物车 0:直接结算（立即购买/拼团/秒杀）
 		**/
 		settlementOrder({type, num = this.goodsNumber, ifcart = 0} = {}) {
-			if(!this.showSpec) {
-				this.showSpec = true;
-				return false;
-			}
-			if(!this.quanxuan) {
-				this.$refs.uToast.show({
-					title: '请选择规格'
-				})
-				return false;
+			if(type != 'involvement') {
+				if(!this.showSpec) {
+					this.showSpec = true;
+					return false;
+				}
+				if(!this.showSpec) {
+					this.showSpec = true;
+					return false;
+				}
+				// 如果没有规格设规格已全选
+				if(this.goodsInfo.spec_value == null) {
+					this.quanxuan = true;
+				}
+				if(!this.quanxuan) {
+					this.$refs.uToast.show({
+						title: '请选择规格'
+					})
+					return false;
+				}
 			}
 			if(!this.debounce) return;
 			this.debounce = false;
@@ -516,6 +526,8 @@ export default {
         },
         xuanze(id){
 			// console.log(id)
+			// 选择完规格后设商品type = 1
+			this.type = 1;
             this.getGoodsDetails(this.glist[id])
 			this.id = this.glist[id];
 		},

pageB/search/index.vue

@@ -13,12 +13,15 @@ export default {
     name:"search",
     data(){
         return{
+			type: '', // 1 商家达人社区 2 商品
 			keyword: "",
 			searchwordlist: [],
         }
 	},
-	created() {
-		this.getWordList();
+	// type: 2 商品 1: 其他
+	onLoad(option) {
+		this.type = option.type;
+		if(option.type == 2) this.getWordList();
 	},
 	// 点击搜索按钮
 	onNavigationBarButtonTap(e) {
@@ -44,13 +47,18 @@ export default {
 				this.$u.toast('搜索内容不可为空');
 				return false;
 			}
+			let params = {
+				value: value,
+				type: this.type,
+			}
+			if(this.type == 2) {
+				Object.assign(params, {
+					order: 'goods_salenum'
+				})
+			}
             this.$u.route({
                 url: "/pageB/search/out",
-                params: {
-                    value: value,
-					type: "shop",
-					order: 'goods_salenum'
-                }
+                params: params,
             })
         }
     }

pageC/classify/index.vue

@@ -50,15 +50,18 @@
 			this.getMenuItemTop()
 		},
 		onNavigationBarButtonTap(e) {
-			if(e.index == 0) this.$u.route('/pageB/search/index');
+			if(e.index == 0) this.$u.route('/pageB/search/index',{ type: 2 });
 		},
 		onNavigationBarSearchInputClicked() {
-			this.$u.route('/pageB/search/index');
+			this.$u.route('/pageB/search/index', { type: 2 });
 		},
 		methods: {
 			toSearchPage() {
 				this.$u.route({
-					url: "pageB/search/index"
+					url: "pageB/search/index",
+					prarms: {
+						type: 2
+					}
 				})
 			},
 			// 获取分类列表

pageE/mine/MemberServe.vue

@@ -101,9 +101,9 @@ export default {
 		},
 		getMemberPointsStat() {
 			this.$u.api.getMemberPointsStat().then((res)=>{
-				if (res.errCode == 0) {
+				if(res.errCode == 0) {
 					this.memberInfo = res.data;
-					this.nodes = common.unescapeHTML(this.memberInfo.points_rule);
+					this.nodes = common.unescapeHTML(this.memberInfo.points_rule.document_content);
 				}
 			})
 		},

pageE/mine/MineProgress.vue

@@ -5,17 +5,17 @@
 				<view class="rank-value">lv{{ memberInfo.member_level }}</view>
 				<view class="line-box">
 					<u-line-progress :percent="percent" :show-percent="false" inactive-color="#FFFFFF" active-color="#F1A36B" height="30" :striped="true" :striped-active="true"></u-line-progress>
-					<text>{{ memberInfo.member_exppoints | percentExp(memberInfo.next_grade_exppoints_diff) }}</text>
+					<text>{{ memberInfo.member_exppoints + '/' + memberInfo.next_member_level_exppoints }}</text>
 				</view>
-				<view class="rank-value">lv{{ memberInfo.member_level + 1 }}</view>
+				<view class="rank-value">lv{{ memberInfo.next_member_level }}</view>
 			</view>
 			<view class="exp-value">经验值<span>{{ memberInfo.member_exppoints }}</span></view>
-			<view class="distance">距离下一级还需要{{ memberInfo.next_grade_exppoints_diff }}经验值</view>
+			<view class="distance">距离下一级还需要 {{ memberInfo.next_member_level_exppoints_diff }} 经验值</view>
 		</view>
 		<view class="body">
 			<view class="title">
 				<image src="/static/image/mine/34.png"></image>
-				<text>等级定义</text>
+				<text>{{ memberInfo.level_rule.document_title }}</text>
 			</view>
 			<!-- <view class="rank-list">
 				<view v-for="(rank, index) in rank" :key="index" class="list-item">
@@ -57,11 +57,9 @@ export default {
 			this.$u.api.getMemberPointsStat().then((res)=>{
 				if (res.errCode == 0) {
 					this.memberInfo = res.data;
-					this.nodes = common.unescapeHTML(res.data.points_rule);
+					this.nodes = common.unescapeHTML(res.data.level_rule.document_content);
 					// console.log(this.percent);
-					this.percent = typeof(res.data.next_grade_exppoints_diff) == 'Number' 
-					? res.data.member_exppoints / (res.data.next_grade_exppoints_diff + res.data.member_exppoints)
-					: 100;
+					this.percent = (res.data.member_exppoints / res.data.next_member_level_exppoints) * 100;
 				}
 			})
 		},

pages/index/index.vue

@@ -441,7 +441,9 @@
 				})
 			},
             goSearch() {
-                this.$u.route("/pageB/search/index");
+                this.$u.route("/pageB/search/index", {
+					type: 1,
+				});
             }
 		},
 	}

pages/shop/index.vue

@@ -112,7 +112,10 @@
 			sousuo() {
 				// console.log(123)
 				this.$u.route({
-					url: "pageB/search/index"
+					url: "pageB/search/index",
+					params: {
+						type: 2,
+					}
 				})
 			},
 			// 获取定位