From d4c8b8e14b22fcdf1543beb3d8913dc1dae0df27 Mon Sep 17 00:00:00 2001
From: LGX <365820713@qq.com>
Date: Wed, 4 Sep 2024 17:03:59 +0800
Subject: [PATCH] 1

---
 api/api.js                                    |   7 +-
 components/cartDiscount/index.vue             |  12 +-
 components/productWindow/index.vue            |  16 +-
 components/timeSlot/index.vue                 |  10 +-
 components/tui-modal/index.vue                |   2 +-
 pages.json                                    |   5 +
 pages/annex/record/record.vue                 |   7 +
 pages/annex/vip_clause/index.vue              |  17 +-
 pages/annex/vip_paid/index.vue                |  54 ++-
 pages/annex/yaoqing/yaoqing.vue               |   4 +-
 pages/extension/news_details/index.vue        |  66 +---
 pages/goods/components/statusLine/index.vue   |  12 +-
 pages/goods/components/verifyModal/index.vue  |  35 +-
 pages/goods/goods_comment_con/index.vue       |   8 +-
 pages/goods/order_after_details/index.vue     |  54 +--
 pages/goods/order_confirm/index.vue           |  31 +-
 pages/goods/order_details/index.vue           |   2 +-
 pages/goods/order_list/index.vue              |   8 +-
 pages/goods_cate/template/template3.vue       | 315 +++++++++++-------
 .../components/preferentialModal/index.vue    |   4 +-
 pages/goods_details/index.vue                 |   7 +-
 pages/index/components/goodList.vue           |  24 +-
 pages/index/index.vue                         |  27 +-
 pages/order_addcart/order_addcart.vue         |  90 ++++-
 pages/store/list/index.vue                    |   6 +
 pages/store/table_code/index.vue              |  15 +-
 pages/user/components/menus/template1.vue     |  49 ++-
 pages/user/index.vue                          |   3 +
 pages/users/promoter-list/index.vue           |  33 +-
 pages/users/user_address/index.vue            |  94 ++++--
 pages/users/user_address_list/index.vue       |  15 +-
 pages/users/user_cash/index.vue               |  17 +-
 pages/users/user_info/index.vue               |  28 +-
 pages/users/user_integral/index.vue           |  64 +++-
 pages/users/user_money/index.vue              | 100 +++++-
 pages/users/user_return_list/index.vue        |  32 +-
 pages/users/user_spread_money/index.vue       |  42 ++-
 static/css/unocss.css                         |  11 +-
 38 files changed, 923 insertions(+), 403 deletions(-)

diff --git a/api/api.js b/api/api.js
index 0e7b51c..7c97d7c 100644
--- a/api/api.js
+++ b/api/api.js
@@ -446,7 +446,12 @@ export function newcomerList(data) {
 		noAuth: true
 	});
 }
-
+// 会员大礼包
+export function store_discountsgetList(data) {
+	return request.post("store_discounts/getList", data, {
+		noAuth: true
+	});
+}
 /**
  * 获取DIY版本接口
  * @param {Object} id
diff --git a/components/cartDiscount/index.vue b/components/cartDiscount/index.vue
index 99c1e08..c20a972 100644
--- a/components/cartDiscount/index.vue
+++ b/components/cartDiscount/index.vue
@@ -2,20 +2,20 @@
 	<view>
 		<!-- 购物车优惠明细 -->
 		<base-drawer mode="bottom" :visible="discountInfo.discount" background-color="transparent" mask maskClosable @close="closeDiscount">
-		  <view class="w-full bg--w111-fff rd-t-40rpx py-32">
-		    <view class="text-center fs-32 text--w111-333 fw-500">金额明细</view>
+		  <view class="w-full bgfot rd-t-40rpx py-32">
+		    <view class="text-center fs-32 colorhui1 fw-500">金额明细</view>
 		    <view class="mt-32 p-32 scroll-content" :style="[moneyPD.pb]">
 				<view class="flex-between-center">
-					<view class="fs-26">商品总价：</view>
-					<view class="fs-28 SemiBold">￥{{discountInfo.deduction.sum_price}}</view>
+					<view class="fs-26 colorhui1">商品总价：</view>
+					<view class="fs-28 SemiBold colorzong">￥{{discountInfo.deduction.sum_price}}</view>
 				</view>
 				<!-- <view class="flex-between-center mt-38">
 					<view class="fs-26">优惠抵扣：</view>
 					<view class="fs-28 SemiBold">-￥{{$util.$h.Sub(discountInfo.deduction.sum_price,discountInfo.deduction.pay_price)}}</view>
 				</view> -->
 				<view class="flex-between-center mt-38" v-if="discountInfo.deduction.coupon_price">
-					<view class="fs-26">{{discountInfo.coupon.coupon_title}}</view>
-					<view class="fs-28 SemiBold">-￥{{discountInfo.deduction.coupon_price}}</view>
+					<view class="fs-26 colorhui1">{{discountInfo.coupon.coupon_title}}</view>
+					<view class="fs-28 SemiBold colorzong">-￥{{discountInfo.deduction.coupon_price}}</view>
 				</view>
 				<view class="flex-between-center mt-38" v-if="discountInfo.deduction.first_order_price">
 					<view class="fs-26">新人首单优惠</view>
diff --git a/components/productWindow/index.vue b/components/productWindow/index.vue
index b6c29da..efe68be 100644
--- a/components/productWindow/index.vue
+++ b/components/productWindow/index.vue
@@ -129,7 +129,7 @@
 		<view class="mask" @touchmove.stop.prevent="moveHandle" :hidden="attr.cartAttr === false" @click="closeAttr"></view>
 		<!-- 选择门店 -->
 		<view class="product-window" :class="isStore?'store':''">
-			<view class="storeTitle">选择门店<text class="iconfont icon-guanbi5" @click="closeStore"></text></view>
+			<view class="storeTitle">选择1门店<text class="iconfont icon-guanbi5" @click="closeStore"></text></view>
 			<view class="storeList">
 				<view class="item" :class="active == index?'on':''" v-for="(item,index) in storeList" :key="index" @click="tapStore(index,item)">
 					<view class="name line1">{{item.name}}</view>
@@ -591,7 +591,7 @@
 		bottom: 0;
 		width: 100%;
 		left: 0;
-		background-color: #1C1A1F;
+		background-color: #080313;
 		z-index: 100;
 		border-radius: 40rpx 40rpx 0 0;
 		transform: translate3d(0, 100%, 0);
@@ -600,7 +600,7 @@
 		padding-bottom: env(safe-area-inset-bottom);///兼容 IOS>11.2/
 		
 		&.store{
-			background-color: #F5F5F5;
+			background-color: #1B1A1D;
 			border-radius: 40rpx 40rpx 0 0;
 			transform: translate3d(0, 0, 0);
 			z-index: 102;
@@ -612,7 +612,7 @@
 			line-height: 100rpx;
 			font-size: 32rpx;
 			font-weight: 500;
-			color: #282828;
+			color: #fff;
 			position: relative;
 			.iconfont{
 				position: absolute;
@@ -625,7 +625,7 @@
 			overflow: auto;
 			.item{
 				width: 690rpx;
-				background: #FFFFFF;
+				background: #1B1A1D;
 				border-radius: 12rpx;
 				margin: 0 auto 20rpx auto;
 				padding: 28rpx 30rpx;
@@ -643,12 +643,12 @@
 				}
 				.name{
 					font-weight: 500;
-					color: #333333;
+					color: #999999;
 					font-size: 28rpx;
 				}
 				.time{
 					font-weight: 400;
-					color: #888888;
+					color: #999999;
 					font-size: 22rpx;
 					margin-top: 15rpx;
 					.iconfont{
@@ -658,7 +658,7 @@
 				}
 				.address{
 					font-weight: 400;
-					color: #888888;
+					color: #999999;
 					font-size: 22rpx;
 					margin-top: 13rpx;
 					.iconfont{
diff --git a/components/timeSlot/index.vue b/components/timeSlot/index.vue
index c2235f8..5626178 100644
--- a/components/timeSlot/index.vue
+++ b/components/timeSlot/index.vue
@@ -170,8 +170,8 @@
 		display: flex;
 		justify-content: space-between;
 		padding: 24rpx 20rpx;
-		background-color: #fff;
-		color: #999;
+		background-color: #1B1A1D;
+		color: #fff;
 		font-size: 24rpx;
 		width: 100%;
 		box-sizing: border-box;
@@ -181,15 +181,15 @@
 
 			.item {
 				margin-right: 20rpx;
-				background: #F5F5F5;
+				// background: #fff;
 				padding: 8rpx 24rpx;
 				border-radius: 30rpx;
 
 			}
 
 			.item.on {
-				color: var(--view-theme);
-				background-color: var(--view-minorColorT);
+				color: #FAAD35;
+				// background-color: var(--view-minorColorT);
 			}
 		}
 		.item{
diff --git a/components/tui-modal/index.vue b/components/tui-modal/index.vue
index e7bcc88..c13ff00 100644
--- a/components/tui-modal/index.vue
+++ b/components/tui-modal/index.vue
@@ -200,7 +200,7 @@
 	}
 	.tui-modal-btn-cancel{
 		border: 1px solid var(--view-theme);
-		color: var(--view-theme);
+		color: #FFFFFF;
 	}
 	.tui-modal-btn-confirm{
 		background-color:#F8A617;
diff --git a/pages.json b/pages.json
index 0ba7038..ac9a105 100644
--- a/pages.json
+++ b/pages.json
@@ -409,6 +409,7 @@
 				{
 					"path": "user_spread_money/index",
 					"style": {
+						"navigationStyle": "custom",
 						"navigationBarTitleText": "佣金记录"
 
 							// #ifdef MP
@@ -621,6 +622,7 @@
 				{
 					"path": "promoter-list/index",
 					"style": {
+						"navigationStyle": "custom",
 						"navigationBarTitleText": "我的团队"
 							// #ifdef MP
 							,
@@ -1350,6 +1352,7 @@
 				{
 					"path": "vip_clause/index",
 					"style": {
+						"navigationStyle": "custom",
 						"navigationBarTitleText": "会员协议",
 						"app-plus": {
 							// #ifdef APP-PLUS
@@ -1494,6 +1497,7 @@
 					"path": "news_details/index",
 					"style": {
 						"navigationBarTitleText": "资讯详情",
+						"navigationStyle": "custom",
 						"app-plus": {
 							// #ifdef APP-PLUS
 							"titleNView": {
@@ -1742,6 +1746,7 @@
 					"path": "order_after_details/index",
 					"style": {
 						"navigationBarBackgroundColor": "#f5f5f5",
+						"navigationStyle": "custom",
 						"navigationBarTextStyle": "white",
 						"navigationBarTitleText": "售后详情",
 						"enablePullDownRefresh": false,
diff --git a/pages/annex/record/record.vue b/pages/annex/record/record.vue
index 713fc5b..6ad0c59 100644
--- a/pages/annex/record/record.vue
+++ b/pages/annex/record/record.vue
@@ -18,6 +18,9 @@
 				{{item.mark}}
 			</view>
 		</view>
+		<view class="colorfff zanwu" v-if="list.length==0">
+			暂无信息
+		</view>
 	</view>
 </template>
 
@@ -79,6 +82,10 @@
 </script>
 
 <style scoped>
+	.zanwu{
+		margin-top: 300rpx;
+		text-align: center;
+	}
 	.jlbox{
 		width: 702rpx;
 		height: 160rpx;
diff --git a/pages/annex/vip_clause/index.vue b/pages/annex/vip_clause/index.vue
index 65e7245..2764752 100644
--- a/pages/annex/vip_clause/index.vue
+++ b/pages/annex/vip_clause/index.vue
@@ -1,6 +1,10 @@
 <template>
-	<view>
-		<view class="title">{{agreement.title}}</view>
+	<view class="box">
+		<view class="topdaohang" @click="fanhui">
+			<uni-icons type="left" size="18" color="white"></uni-icons>
+			<text>会员卡协议</text>
+		</view>
+		<view class="title colorhui1">{{agreement.title}}</view>
 		<view class="cont" v-html="agreement.content"></view>
 	</view>
 </template>
@@ -20,6 +24,9 @@
 			this.memberCard();
 		},
 		methods: {
+			fanhui(){
+				uni.navigateBack()
+			},
 			memberCard() {
 				uni.showLoading({
 					title: '加载中'
@@ -53,5 +60,11 @@
 
 	.cont {
 		padding: 50rpx 30rpx;
+		/* background: black; */
+		
+	}
+	.box{
+		background: linear-gradient(to bottom, #a31de0 0%, #120F0E 50%), linear-gradient(to right, #31173D, #120F0E);
+		background-blend-mode: multiply;
 	}
 </style>
diff --git a/pages/annex/vip_paid/index.vue b/pages/annex/vip_paid/index.vue
index c970b50..14fed9b 100644
--- a/pages/annex/vip_paid/index.vue
+++ b/pages/annex/vip_paid/index.vue
@@ -124,7 +124,7 @@
 					<view class="zsbox1" v-for="(item,index) in newcomer_products"
 						:class="libaoindex==index?'zsbox1xz':'zsbox1'" @click="lbxzclick(index)">
 						<image class="wh330" :src="item.image" mode=""></image>
-						<view class="colorfff fs-32 zsboxtitle">{{item.store_name}}</view>
+						<view class="colorfff fs-32 zsboxtitle">{{item.title}}</view>
 						<view class="maleft24">
 							<text class="colorzong">
 								￥{{item.price}}
@@ -140,7 +140,7 @@
 				<checkbox-group v-model="checkboxValue1" @change='change'>
 					<label class="radio">
 						<checkbox value="r1" class="checkbox-backgroun-yellow" /><text
-							class="colorhui1">我已阅读会员用卡协议</text>
+							class="colorhui1">我已阅读 <text @click.stop="hyxy" style="color: #F8A617;">《会员用卡协议》</text></text>
 					</label>
 				</checkbox-group>
 			</view>
@@ -199,7 +199,8 @@
 		toLogin
 	} from '@/libs/login.js';
 	import {
-		newcomerList
+		newcomerList,
+		store_discountsgetList
 	} from '@/api/api.js'
 	import {
 		postCartAdd
@@ -274,7 +275,7 @@
 		},
 		onShow() {
 			this.memberCard()
-			this.getnewcomerList()
+			
 		},
 		onReachBottom() {
 			this.groomList();
@@ -292,28 +293,40 @@
 			// #endif
 		},
 		methods: {
+			hyxy(){
+				uni.navigateTo({
+					url:'/pages/annex/vip_clause/index'
+				})
+			},
 			ljlingka() {
 				// this.createMemberCard('weixin');
+				var discountInfos=[]
+				this.newcomer_products[this.libaoindex].products.forEach(el=>{
+					discountInfos.push({product_id:el.product_id,"unique":"",id:el.id})
+				})
 				if (this.ishyxy) {
 					let data = {
 						addressId: "",
 						cartNum: 1,
 						delivery_type: '',
 						new: 1,
-						productId: this.newcomer_products[this.libaoindex].product_id,
-						store_id: uni.getStorageSync('mendianstore_id'),
-						uniqueId: ""
+						productId:'',
+						store_id: 0,
+						uniqueId: "",
+						discountInfos:discountInfos,
+						discountId:this.newcomer_products[this.libaoindex].id,
+						member_type: this.memberType[this.tykindex].id
 					};
 					postCartAdd(data).then(res => {
 						console.log(987, res);
 						uni.navigateTo({
-							url: '/pages/goods/order_confirm/index?huiyuanka=1&product_id=' +
-								this.newcomer_products[this.libaoindex].product_id + '&new=1&cartId=' +
+							url: '/pages/goods/order_confirm/index?huiyuanka=1&product_id=""&discountInfos' +
+								discountInfos +'&discountId=' + this.newcomer_products[this.libaoindex].id+ '&new=1&cartId=' +
 								res.data.cartId + '&huiyuankajiage=' + this.memberType[this.tykindex]
 								.pre_price +
 								'&huiyuanzhekou=' + this.number + '&vipmoney=' + this.memberType[this
 									.tykindex].price +
-								'&vipprice=' + this.memberType[this.tykindex].pre_price
+								'&vipprice=' + this.memberType[this.tykindex].pre_price+'&member_type=' + this.memberType[this.tykindex].id
 						})
 					})
 
@@ -323,9 +336,11 @@
 					})
 				}
 			},
-			getnewcomerList() {
-				newcomerList().then(res => {
-					this.newcomer_products = res.data.newcomer_products
+			getnewcomerList(vip_type) {
+				store_discountsgetList({vip_type:vip_type}).then(res => {
+					console.log(' res.data.list',res);
+					this.newcomer_products = res.data.list
+					console.log(' res.data.list11',this.newcomer_products);
 				})
 			},
 			change(e) {
@@ -337,6 +352,7 @@
 			},
 			tykxzindex(i) {
 				this.tykindex = i
+				this.getnewcomerList(this.memberType[this.tykindex].id)
 				console.log(45, this.memberType[this.tykindex].pre_price);
 			},
 			yaoqing() {
@@ -400,6 +416,7 @@
 					this.userInfo = is_get_free.user_info;
 					this.memberRights = member_rights;
 					this.memberType = member_type;
+					this.getnewcomerList(this.memberType[0].id)
 					this.memberRights.forEach(el => {
 						console.log('el', el);
 						if (el.id == '7') {
@@ -551,7 +568,15 @@
 					this.$refs.popup.open('center')
 					this.guzkneirong = item
 				} else {
-					this.yaoqing()
+					if(this.userInfo.pay_vip_status){
+						this.yaoqing()
+					}else{
+						uni.showToast({
+							title: '请先购买会员',
+							icon: 'none'
+						});
+					}
+					
 				}
 
 			},
@@ -632,6 +657,7 @@
 		height: 470rpx;
 		background: #1B1A1D;
 		border-radius: 20rpx;
+		padding: 2rpx;
 	}
 
 	.zsbox1xz {
diff --git a/pages/annex/yaoqing/yaoqing.vue b/pages/annex/yaoqing/yaoqing.vue
index 23d9077..4b5cc17 100644
--- a/pages/annex/yaoqing/yaoqing.vue
+++ b/pages/annex/yaoqing/yaoqing.vue
@@ -67,7 +67,7 @@
 								{
 								    type: 'image', //绘制类型(color:背景色;image:图片;text:文字;line:线条),
 								    width: 120, //宽度(rpx)
-								    height: 100, //高度(rpx)
+								    height: 120, //高度(rpx)
 								    x: 50, //x轴位置(离左边的距离rpx)
 								    y: 900, //y轴位置(离上边的距离rpx)
 								    radius: 55, //圆角(rpx)
@@ -320,6 +320,6 @@
 
 	.hbimg {
 		width: 660rpx;
-		height: 830rpx;
+		height: 950rpx;
 	}
 </style>
\ No newline at end of file
diff --git a/pages/extension/news_details/index.vue b/pages/extension/news_details/index.vue
index e2676dd..22c7c2f 100644
--- a/pages/extension/news_details/index.vue
+++ b/pages/extension/news_details/index.vue
@@ -1,13 +1,17 @@
 <template>
 	<view :style="colorStyle">
+		<view class="topdaohang" @click="goarrow">
+			<text class="iconfont icon-ic_leftarrow"></text>
+			<text >{{ articleInfo.title }}</text>
+		</view>
 		<view class="px-32">
-			<view class="fs-36 fw-500 lh-54rpx mt-44">{{ articleInfo.title }}</view>
+			<view class="fs-36 fw-500 lh-54rpx mt-44 colorhui1">{{ articleInfo.title }}</view>
 			<view class="flex fs-24 text--w111-999 mt-16">
-				<text>{{ articleInfo.catename }}</text>
+				<text class="colorhui1">{{ articleInfo.catename }}</text>
 				<text class="px-16">|</text>
 				<text>{{ articleInfo.add_time }}</text>
 			</view>
-			<view class="content fs-30 text--w111-333 lh-52rpx mt-32">
+			<view class="content fs-30 colorhui1 lh-52rpx mt-32">
 				<jyf-parser :html="content" ref="article" :tag-style="tagStyle"></jyf-parser>
 			</view>
 			<view class="bg--w111-f5f5f5 rd-24rpx w-full flex-between-center p-20 mt-32" @tap="goDetail" v-if="store_info.id">
@@ -21,52 +25,7 @@
 				</view>
 			</view>
 		</view>
-		<view class="h-200"></view>
-		<view class="bg--w111-fff w-full z-99 fixed-lb pb-safe">
-			<view class="w-full h-128 pr-20 flex-y-center" v-if="store_info.id">
-				<!-- #ifdef H5 -->
-				<text class="iconfont icon-ic_transmit1 fs-44 ml-52" @tap="listenerActionSheet"></text>
-				<!-- #endif -->
-				<!-- #ifdef MP -->
-				<button open-type="share" hover-class="none">
-					<text class="iconfont icon-ic_transmit1 fs-44 ml-52"></text>
-				</button>
-				<!-- #endif -->
-				<view class="ml-80 relative">
-					<text class="iconfont icon-ic_Eyes fs-44"></text>
-					<text class="fs-20 fw-500 abs-num">{{ articleInfo.visit }}</text>
-				</view>
-				<view class="ml-80 relative" :class="{ active: articleInfo.is_like }" @tap="giveLike">
-					<text class="iconfont icon-ic_Like fs-44"></text>
-					<text class="fs-20 fw-500 likes-num">{{ articleInfo.likes }}</text>
-				</view>
-				<view class="w-300 h-72 rd-36rpx flex-center bg--w111-f5f5f5 ml-80" @tap="goDetail">
-					<image :src="store_info.image" class="w-48 h-48 rd-8rpx"></image>
-					<view class="pl-12">
-						<view class="fs-22 fw-500 w-172 line1">{{ store_info.store_name }}</view>
-						<view class="fs-20 SemiBold">¥{{ store_info.price }}</view>
-					</view>
-				</view>
-			</view>
-			<view class="w-full px-120 h-128 flex-between-center" v-else>
-				<!-- #ifdef H5 -->
-				<text class="iconfont icon-ic_transmit1 fs-44" @tap="listenerActionSheet"></text>
-				<!-- #endif -->
-				<!-- #ifdef MP -->
-				<button open-type="share" hover-class="none">
-					<text class="iconfont icon-ic_transmit1 fs-44"></text>
-				</button>
-				<!-- #endif -->
-				<view class="relative">
-					<text class="iconfont icon-ic_Eyes fs-44"></text>
-					<text class="fs-20 fw-500 abs-num">{{ articleInfo.visit }}</text>
-				</view>
-				<view class="relative" :class="{ active: articleInfo.is_like }" @tap="giveLike">
-					<text class="iconfont icon-ic_Like fs-44"></text>
-					<text class="fs-20 fw-500 likes-num">{{ articleInfo.likes }}</text>
-				</view>
-			</view>
-		</view>
+		
 		<shareInfo @setShareInfoStatus="setShareInfoStatus" :shareInfoStatus="shareInfoStatus"></shareInfo>
 	</view>
 </template>
@@ -123,12 +82,15 @@ export default {
 		this.getArticleOne();
 	},
 	methods: {
+		goarrow(){
+			uni.navigateBack()
+		},
 		getArticleOne: function () {
 			let that = this;
 			getArticleDetails(that.id).then((res) => {
-				uni.setNavigationBarTitle({
-					title: res.data.title.substring(0, 7) + '...'
-				});
+				// uni.setNavigationBarTitle({
+				// 	title: res.data.title.substring(0, 7) + '...'
+				// });
 				that.$set(that, 'articleInfo', res.data);
 				that.$set(that, 'store_info', res.data.store_info ? res.data.store_info : {});
 				that.content = res.data.content;
diff --git a/pages/goods/components/statusLine/index.vue b/pages/goods/components/statusLine/index.vue
index a90b96d..cac0602 100644
--- a/pages/goods/components/statusLine/index.vue
+++ b/pages/goods/components/statusLine/index.vue
@@ -1,17 +1,17 @@
 <template>
-	<view class="bg--w111-fff rd-16rpx pt-32 pl-24 pr-24 pb-32 flex-between-center">
+	<view class="bgfot rd-16rpx pt-32 pl-24 pr-24 pb-32 flex-between-center">
 		<view v-for="(item,index) in list" :key="index" class="item">
 			<view class="h-32 flex-x-center item relative" >
-				<view v-if="index <= indexActive" class="iconfont fs-32 text--w111-999 icon-a-ic_CompleteSelect"></view>
-				<view v-else class="w-32 h-32 borderRadius15 bg--w111-f5f5f5 acea-row row-center-wrapper">
-					<view class="iconfont icon-ic_complete fs-22 text--w111-999"></view>
+				<view v-if="index <= indexActive" class="iconfont fs-32 colorhui icon-a-ic_CompleteSelect"></view>
+				<view v-else class="w-32 h-32 borderRadius15  acea-row row-center-wrapper" style="background: #7B7A7F;">
+					<view class="iconfont icon-ic_complete fs-22 colorhei"></view>
 				</view>
 				<text class="line"
 					:style="{'width': lineWidth + 'rpx','right': lineRight}"
 					:class="index < indexActive ? 'bg-color' : ''"
 					></text>
 			</view>
-			<view class="fs-22 text--w111-999 lh-30rpx mt-16" :class="{active:index <= indexActive}">{{item}}</view>
+			<view class="fs-22 colorhui lh-30rpx mt-16" :class="{active:index <= indexActive}">{{item}}</view>
 		</view>
 	</view>
 </template>
@@ -99,6 +99,6 @@
 		color: var(--view-theme);
 	}
 	.active{
-		color: #333;
+		color: #fff;
 	}
 </style>
diff --git a/pages/goods/components/verifyModal/index.vue b/pages/goods/components/verifyModal/index.vue
index 1d25f8f..74bea47 100644
--- a/pages/goods/components/verifyModal/index.vue
+++ b/pages/goods/components/verifyModal/index.vue
@@ -20,7 +20,11 @@
 						<!-- #endif -->
 					</view>
 				</view>
-				<view class="bg-primary-light qrocode-num rd-16rpx flex-center fs-32 fw-500 font-num mt-48">{{verifyCode}}</view>
+				<view class="acea-row row-center-wrapper">
+					{{config.bar.code}}
+					<w-barcode :options="config.bar"></w-barcode>
+				</view>
+				<!-- <view class="bg-primary-light qrocode-num rd-16rpx flex-center fs-32 fw-500 font-num mt-48">{{verifyCode}}</view> -->
 				<view class="mt-24 text--w111-999 fs-24" v-if="writeDay">核销时间：{{writeDay}}</view>
 			</view>
 			<text class="iconfont icon-ic_close1 close fs-48 text--w111-fff"></text>
@@ -65,6 +69,35 @@
 				default:""
 			},
 		},
+		watch:{
+			verifyCode(){
+				this.config.bar.code= this.verifyCode
+			}
+		},
+		data(){
+			return{
+				config: {
+					bar: {
+						code:'',
+						color: ['#000'],
+						bgColor: '#FFFFFF', // 背景色
+						width: 480, // 宽度
+						height: 110 // 高度
+					},
+					qrc: {
+						code: '',
+						size: 380, // 二维码大小
+						level: 3, //等级 0～4
+						bgColor: '#FFFFFF', //二维码背景色 默认白色
+						border: {
+							color: ['#eee', '#eee'], //边框颜色支持渐变色
+							lineWidth: 3, //边框宽度
+						},
+						color: ['#333', '#333'], //边框颜色支持渐变色
+					}
+				},
+			}
+		},
 		methods:{
 			moveHandle(){
 				return false
diff --git a/pages/goods/goods_comment_con/index.vue b/pages/goods/goods_comment_con/index.vue
index 9661661..0f1bf2b 100644
--- a/pages/goods/goods_comment_con/index.vue
+++ b/pages/goods/goods_comment_con/index.vue
@@ -43,9 +43,9 @@
 			</view>
 			<view class="bgfot rd-24rpx mt-20 pt-32 pr-24 pb-32 pl-24">
 				<view class="flex-y-center">
-					<text class="fs-28 fw-500 colorhui1">商品质量</text>
+					<text class="fs-28 fw-500 colorhui1 ">商品质量</text>
 					<view class="ml-40 flex">
-						<text class="star iconfont colorhui1"
+						<text class="star iconfont colorhui1 fonts45"
 							:class="item <= product_score ? 'icon-ic_star1 colorhuang' : 'icon-ic_star'"
 							v-for="(item, index) in starArr" :key="index" @click="stars(0,item)"></text>
 					</view>
@@ -53,7 +53,7 @@
 				<view class="flex-y-center mt-40">
 					<text class="fs-28 fw-500 colorhui1">服务态度</text>
 					<view class="ml-40 flex">
-						<text class="star iconfont colorhui1"
+						<text class="star iconfont colorhui1 fonts45"
 							:class="item <= service_score ? 'icon-ic_star1 colorhuang' : 'icon-ic_star'"
 							v-for="(item, index) in starArr" :key="index" @click="stars(1,item)"></text>
 					</view>
@@ -62,7 +62,7 @@
 				<view class="flex-y-center mt-40">
 					<text class="fs-28 fw-500 colorhui1">物流服务</text>
 					<view class="ml-40 flex">
-						<text class="star iconfont colorhui1"
+						<text class="star iconfont colorhui1 fonts45"
 							:class="item <= delivery_score ? 'icon-ic_star1 colorhuang' : 'icon-ic_star'"
 							v-for="(item, index) in starArr" :key="index" @click="stars(2,item)"></text>
 					</view>
diff --git a/pages/goods/order_after_details/index.vue b/pages/goods/order_after_details/index.vue
index bc1d2e7..fa3c477 100644
--- a/pages/goods/order_after_details/index.vue
+++ b/pages/goods/order_after_details/index.vue
@@ -1,15 +1,19 @@
 <template>
 	<view  :style="colorStyle">
+		<view class="topdaohang" @click="goarrow">
+			<text class="iconfont icon-ic_leftarrow"></text>
+			<text >售后详情</text>
+		</view>
 		<view class="px-20">
 			<view class="flex justify-between mt-24">
 				<view class="flex-1 mt-8">
-					<view class="fs-36 fw-500 lh-50rpx">{{orderInfo._status._msg}}</view>
+					<view class="fs-36 fw-500 lh-50rpx colorfff">{{orderInfo._status._msg}}</view>
 					<view class="w-486 fs-24 text--w111-999 lh-34rpx mt-12">{{orderInfo._status.desc}}</view>
 				</view>
 				<image :src="orderInfo._status.pic" class="w-172 h-172"></image>
 			</view>
 			<statusLine :type="orderInfo._status._type" :applyType="orderInfo.apply_type"></statusLine>
-			<view class="bg--w111-fff rd-16rpx mt-20 pt-32 pl-24 pr-24 pb-32"
+			<view class="bgfot rd-16rpx mt-20 pt-32 pl-24 pr-24 pb-32"
 				v-if="[2,3].includes(orderInfo.apply_type)">
 				<view class="flex-between-center">
 					<text class="fs-32 fw-500">商家地址</text>
@@ -19,21 +23,21 @@
 					<text>{{orderInfo._status.refund_name}}</text>
 					<text class="pl-20">{{orderInfo._status.refund_phone}}</text>
 				</view>
-				<view class="w-full fs-24 lh-34rpx text--w111-999 mt-8 line2">{{orderInfo._status.refund_address}}</view>
+				<view class="w-full fs-24 lh-34rpx colorhui1 mt-8 line2">{{orderInfo._status.refund_address}}</view>
 			</view>
-			<view class="bg--w111-fff rd-16rpx mt-20 pt-32 pl-24 pr-24 pb-32">
+			<view class="bgfot rd-16rpx mt-20 pt-32 pl-24 pr-24 pb-32">
 				<view class="flex justify-between order_goods" v-for="(item,index) in cartInfo" :key="index">
 					<image class="w-136 h-136 rd-16rpx" :src='item.productInfo.attrInfo.image' v-if="item.productInfo.attrInfo"></image>
 					<image class="w-136 h-136 rd-16rpx" :src='item.productInfo.image' v-else></image>
 					<view class="flex-1 h-136 pl-20 flex-col justify-between">
-						<view class="w-full fs-28 lh-40rpx line2">{{item.productInfo.store_name}}</view>
+						<view class="w-full fs-28 lh-40rpx line2 colorhui1">{{item.productInfo.store_name}}</view>
 						<view class="flex-between-center fs-24 lh-34rpx">
-							<text class="text--w111-999">购买数量: {{item.cart_num}}</text>
-							<text>购买售价：{{item.productInfo.attrInfo ? item.productInfo.attrInfo.price : item.productInfo.price}}</text>
+							<text class="colorhui1">购买数量: {{item.cart_num}}</text>
+							<text class="colorhui1">购买售价：{{item.productInfo.attrInfo ? item.productInfo.attrInfo.price : item.productInfo.price}}</text>
 						</view>
 					</view>
 				</view>
-				<view class="bt mt-32">
+				<view class="bt mt-32 colorhui1">
 					<view class="pt-32 flex-between-center fs-28">
 						<text>退款原因</text>
 						<text>{{orderInfo.refund_reason}}</text>
@@ -48,26 +52,26 @@
 					</view>
 				</view>
 			</view>
-			<view class="bg--w111-fff rd-16rpx mt-20 pt-32 pl-24 pr-24 pb-32">
+			<view class="bgfot rd-16rpx mt-20 pt-32 pl-24 pr-24 pb-32 colorhui1">
 				<view class="cell flex-between-center">
-					<text class="fs-28">订单编号</text>
+					<text class="fs-28 colorhui">订单编号</text>
 					<view>
 						<text class="fs-28 pr-12">{{orderInfo.store_order_sn}}</text>
 						<text class="inline-block copy_btn fs-22" @click="copy(orderInfo.store_order_sn)">复制</text>
 					</view>
 				</view>
 				<view class="cell flex-between-center fs-28">
-					<text>申请时间</text>
+					<text class="colorhui">申请时间</text>
 					<text>{{orderInfo._add_time}}</text>
 				</view>
 				<view class="cell flex-between-center fs-28">
-					<text>售后类型</text>
+					<text  class="colorhui">售后类型</text>
 					<text v-if="orderInfo.apply_type == 1">仅退款</text>
 					<text v-else-if="[2,3].includes(orderInfo.apply_type)">退货退款</text>
 					<text v-else-if="orderInfo.apply_type == 4">商家主动退款</text>
 				</view>
 				<view class="cell flex-between-center">
-					<text class="fs-28">售后单号</text>
+					<text class="fs-28  colorhui">售后单号</text>
 					<view>
 						<text class="fs-28 pr-12">{{orderInfo.order_id}}</text>
 						<text class="inline-block copy_btn fs-22" @click="copy(orderInfo.order_id)">复制</text>
@@ -75,11 +79,11 @@
 				</view>
 				<view class="bt mt-32">
 					<view class="pt-32 flex justify-between fs-28" v-if="orderInfo.remark">
-						<text>备注说明</text>
+						<text  class="colorhui">备注说明</text>
 						<view class="w-462 line2 lh-40rpx text-right">{{orderInfo.remark}}</view>
 					</view>
 					<view class="pt-32 flex justify-between fs-28" v-if="orderInfo.refund_img && orderInfo.refund_img.length">
-						<text>售后凭证</text>
+						<text  class="colorhui">售后凭证</text>
 						<view class="w-462 flex justify-end" v-if="orderInfo.refund_img.length < 5">
 							<view class='pictrue mr-8' v-for="(item,index) in orderInfo.refund_img" :key="index">
 							  <image class="w-88 h-88 rd-8rpx" :src='item' mode="aspectFill" ></image>
@@ -93,12 +97,12 @@
 						</scroll-view>
 					</view>
 					<view class="pt-32 flex justify-between fs-28">
-						<text>退款方式</text>
+						<text  class="colorhui">退款方式</text>
 						<view class="w-462 line2 lh-40rpx text-right">{{orderInfo.refund_price_type}}</view>
 					</view>
 				</view>
 			</view>
-			<view class="bg--w111-fff rd-16rpx mt-20 pt-32 pl-24 pr-24 pb-32" v-if="[2,3].includes(orderInfo.apply_type) && orderInfo._status._type== 5">
+			<view class="bgfot rd-16rpx mt-20 pt-32 pl-24 pr-24 pb-32" v-if="[2,3].includes(orderInfo.apply_type) && orderInfo._status._type== 5">
 				<view class="fs-28 fw-500">退货信息</view>
 				<view class="bt mt-32">
 					<view class="pt-32 flex justify-between fs-28">
@@ -140,18 +144,18 @@
 			</view>
 		</view>
 		<view class="h-200"></view>
-		<view class='fixed-lb bt w-full bg--w111-fff pb-safe'>
+		<view class='fixed-lb bt w-full bgfot pb-safe'>
 			<view class="h-96 px-20 flex-y-center justify-end">
-				<view class="btn w-144 h-56 rd-30rpx flex-center fs-24 border bg--w111-fff"
+				<view class="btn w-144 h-56 rd-30rpx flex-center fs-24 border bgfot"
 					v-if="[0,1,2,4,5].includes(orderInfo.refund_type) && orderInfo.is_cancel == 0"
 					@tap='cancelRefundOrder'>撤销售后</view>
-				<view class="btn w-144 h-56 rd-30rpx flex-center fs-24 text--w111-fff bg-color"
+				<view class="btn w-144 h-56 rd-30rpx flex-center fs-24 colorhui1 bg-color"
 					v-if="orderInfo.refund_type == 4 && orderInfo.is_cancel == 0 && orderInfo.apply_type == 2"
 					@tap='refundInput'>退回商品</view>
-				<view class="btn w-144 h-56 rd-30rpx flex-center fs-24 text--w111-fff bg-color"
+				<view class="btn w-144 h-56 rd-30rpx flex-center fs-24 colorhui1 bg-color"
 					v-if="[5,6].includes(orderInfo.refund_type) && orderInfo.apply_type == 2"
 					@tap='refundLogistics'>返件信息</view>
-				<view class="btn w-144 h-56 rd-30rpx flex-center fs-24 border bg--w111-fff"
+				<view class="btn w-144 h-56 rd-30rpx flex-center fs-24 border colorhui1"
 					v-if="orderInfo.refund_type == 3 && orderInfo.is_cancel == 0" @click="refundAgain">再次申请</view>
 			</view>
 		</view>
@@ -260,6 +264,9 @@
 			}
 		},
 		methods: {
+			goarrow(){
+				uni.navigateBack()
+			},
 			onLoadFun() {
 				this.getOrderInfo();
 				this.getUserInfo();
@@ -466,6 +473,7 @@
 	border-radius: 20rpx;
 	text-align:center;
 	line-height:36rpx;
+	color: #080313;
 }
 .btn ~ .btn{
 	margin-left: 16rpx;
@@ -475,6 +483,8 @@
 }
 .border{
 	border: 1rpx solid #ccc;
+	background: #FAAD35;
+	color: #080313;
 }
 .border_bt{
 	border-bottom: 1rpx solid #eee;
diff --git a/pages/goods/order_confirm/index.vue b/pages/goods/order_confirm/index.vue
index cf3363b..6b2829a 100644
--- a/pages/goods/order_confirm/index.vue
+++ b/pages/goods/order_confirm/index.vue
@@ -546,7 +546,7 @@
 						<text class="pl-12" v-if="type == 4 && totalIntegral > 0">+{{totalIntegral}}积分</text>
 					</view>
 					<view class="w-168 h-72 rd-36rpx flex-center colorhei fs-26 bg-color-huang z-10" @tap.stop="goPay"
-						v-if="(((valid_count>0&&!discount_id) || (valid_count==cartInfo.length&&discount_id)) && shippingType) || (!shippingType && addressId) || product_type != 0">
+						v-if="(((valid_count>0&&!discount_id) || (valid_count==cartInfo.length&&discount_id)) && shippingType) || (!shippingType && addressId) || product_type != 0 ||addressId==0">
 						提交订单</view>
 					<view class="w-168 h-72 rd-36rpx flex-center bg-color-huang fs-26 colorhei" v-else>提交订单</view>
 				</view>
@@ -748,7 +748,8 @@
 				isStore: 0,
 				huiyuanka:0,
 				huiyuankajiage:0,
-				huiyuanzhekou:0
+				huiyuanzhekou:0,
+				isCollagemendian:''
 			};
 		},
 		computed: {
@@ -778,6 +779,7 @@
 			this.huiyuanzhekou=options.huiyuanzhekou
 			this.vipmoney=options.vipmoney
 			this.vipprice=options.vipprice
+			this.member_type=options.member_type
 			uni.setStorage({
 				key:'ishuiyuanka',
 				data: [{
@@ -891,6 +893,16 @@
 			})
 			this.timeranges = arrayNew;
 			// this.getConfirm('', 1);
+			this.isCollagemendian=uni.getStorageSync('isCollagemendian')
+			console.log('this.isCollagemendian',this.isCollagemendian);
+			if(this.isCollagemendian!=''){
+				this.storeId=this.isCollagemendian
+				this.getList()
+			}
+		},
+		onHide(){
+			uni.setStorageSync('isCollagemendian','')
+			console.log('跳转到别的页面');
 		},
 		methods: {
 			goStore() {
@@ -1060,6 +1072,7 @@
 					`new=${this.news}&cartId=${this.cartId}&pinkId=${this.pinkId}&couponId=${this.couponId}&addressId=${this.addressId}&specialInvoice=${this.special_invoice}&couponTitle=${this.couponTitle}`;
 			},
 			goPay() {
+				console.log(99999);
 				this.formVerify();
 				
 				
@@ -1068,7 +1081,7 @@
 				var data={
 					from: "routine",
 					libao_id: libaoid,
-					member_type: 1,
+					member_type: this.member_type,
 					money: this.vipmoney,
 					pay_type: "weixin",
 					price: this.vipprice,
@@ -1099,6 +1112,7 @@
 					let list = res.data.list.list || [];
 					this.$set(this, 'storeList', list);
 					this.$set(this, 'storeId', this.storeId != 0 ? this.storeId : list[0].id);
+					console.log('this.storeId',this.storeId);
 					list.forEach(item => {
 						if (this.storeId == item.id) {
 							this.$set(this, 'system_store', item);
@@ -1236,6 +1250,9 @@
 					addressId = that.addressId
 				}
 				let store_id = uni.getStorageSync('mendianstore_id')
+				if(that.huiyuanka=='1'){
+					store_id=0
+				}
 				orderConfirm(that.cartId, that.news, addressId, shippingType, store_id, that.couponId, that
 					.luckRecordId).then(res => {
 					if (res.data.upgrade_addr == 1) {
@@ -1479,7 +1496,9 @@
 						'&vipmoney=' +
 						this.vipmoney+
 						'&vipprice=' +
-						this.vipprice
+						this.vipprice+
+						'&member_type=' +
+						 this.member_type
 						
 						// this.huiyuanka=options.huiyuanka
 						// this.huiyuankajiage=options.huiyuankajiage
@@ -1499,7 +1518,9 @@
 						'&vipmoney=' +
 						this.vipmoney+
 						'&vipprice=' +
-						this.vipprice
+						this.vipprice+
+						'&member_type=' +
+						 this.member_type
 					})
 				}
 			},
diff --git a/pages/goods/order_details/index.vue b/pages/goods/order_details/index.vue
index b9b6c12..42c6a3d 100644
--- a/pages/goods/order_details/index.vue
+++ b/pages/goods/order_details/index.vue
@@ -388,7 +388,7 @@
 		:visible="showQrcode"
 		:qrcode="config.qrc"
 		:qrc="qrc"
-		:verifyCode="orderInfo._verify_code"
+		:verifyCode="orderInfo.verify_code"
 		:writeDay="orderInfo.write_day"
 		:writeTimes="orderInfo.write_times"
 		:writeOff="orderInfo.write_off"
diff --git a/pages/goods/order_list/index.vue b/pages/goods/order_list/index.vue
index 78056f4..3402718 100644
--- a/pages/goods/order_list/index.vue
+++ b/pages/goods/order_list/index.vue
@@ -1,6 +1,6 @@
 <template>
-	<view>
-		<view class="fixed-lt  w-full z-999 header_box" :style="{'padding-top': sysHeight + 'px'}">
+	<view class="bghei">
+		<view class="fixed-lt  w-full z-999 header_box bgjianbian" :style="{'padding-top': sysHeight + 'px'}">
 			<view class="h-80 px-20 flex-y-center"  @click="goPage(3)">
 				<text class="iconfont icon-ic_leftarrow fs-40 colorfff"></text>
 				<!--  #ifdef  MP-WEIXIN -->
@@ -541,6 +541,10 @@
 </script>
 
 <style scoped lang="scss">
+	.bgjianbian{
+		background: linear-gradient(to bottom, #a31de0 0%, #120F0E 100%), linear-gradient(to right, #31173D, #120F0E);
+		background-blend-mode: multiply;
+	}
 	.border_con {
 		border: 1px solid var(--view-theme);
 	}
diff --git a/pages/goods_cate/template/template3.vue b/pages/goods_cate/template/template3.vue
index 3539244..5926d3e 100644
--- a/pages/goods_cate/template/template3.vue
+++ b/pages/goods_cate/template/template3.vue
@@ -6,25 +6,23 @@
 					<!-- #ifdef MP -->
 					<view class="flex-1 h-58 flex-y-center rd-30rpx bgfot px-32" @tap="goSearch">
 					<!-- #endif -->
-					<!-- #ifndef MP -->
-					<view class="w-full h-58 flex-y-center rd-30rpx bg--w111-f5f5f5 px-32" @tap="goSearch">
-					<!-- #endif -->
-						<text class="iconfont icon-ic_search fs-28"></text>
-						<text class="fs-24 pl-18">请输入商品名称</text>
+						<!-- #ifndef MP -->
+						<view class="w-full h-58 flex-y-center rd-30rpx bg--w111-f5f5f5 px-32" @tap="goSearch">
+						<!-- #endif -->
+							<text class="iconfont icon-ic_search fs-28"></text>
+							<text class="fs-24 pl-18">请输入商品名称</text>
+						</view>
+						<!-- 胶囊占据的位置 -->
+						<!-- #ifdef MP -->
+						<view class="ml-12" :style="'width:'+getHeight.barWidth+'px'"></view>
+						<!-- #endif -->
 					</view>
-					<!-- 胶囊占据的位置 -->
-					<!-- #ifdef MP -->
-					<view class="ml-12" :style="'width:'+getHeight.barWidth+'px'"></view>
-					<!-- #endif -->
 				</view>
-			</view>
 				<view class="scroll_box flex flex-1">
 					<view class="w-168 h-full">
 						<scroll-view :scroll-top="0" scroll-y="true" class="h-full">
-							<view class="w-168 h-96 flex-center fs-26 colorhui1"
-								v-for="(item,index) in categoryList":key="index"
-								:class="index == navActive?'aside_active':''"
-								@tap="tapNav(index,item)">
+							<view class="w-168 h-96 flex-center fs-26 colorhui1" v-for="(item,index) in categoryList"
+								:key="index" :class="index == navActive?'aside_active':''" @tap="tapNav(index,item)">
 								<view class="top-ra">
 									<text></text>
 								</view>
@@ -67,8 +65,7 @@
 										<easy-loadimage
 											:image-src="item.recommend_image ? item.recommend_image : item.image"
 											:borderSrc="item.recommend_image ? '' :item.activity_frame.image"
-											width="540rpx"
-											:height="item.recommend_image ? '216rpx' : '540rpx'"
+											width="540rpx" :height="item.recommend_image ? '216rpx' : '540rpx'"
 											borderRadius="20rpx 20rpx 0 0"></easy-loadimage>
 										<view class="bg--w111-fff rd-b-20rpx pt-16 pl-24 pr-24 pb-24">
 											<view class="w-full line2 fs-28 text--w111-333 lh-40rpx">{{item.store_name}}
@@ -84,7 +81,9 @@
 													class="w-172 h-58 rd-30rpx bg-color flex-center fs-24 text--w111-fff relative"
 													v-if="item.spec_type" @tap.stop="goCartDuo(item)">
 													<text>{{item.cart_button == 0 ? '立即购买' : '加入购物车'}}</text>
-													<uni-badge class="badge-style" :custom-style="{background: 'var(--view-theme)'}" v-if="item.cart_num > 0" :text="item.cart_num"></uni-badge>
+													<uni-badge class="badge-style"
+														:custom-style="{background: 'var(--view-theme)'}"
+														v-if="item.cart_num > 0" :text="item.cart_num"></uni-badge>
 												</view>
 												<view v-if="!item.spec_type && !item.cart_num">
 													<view
@@ -113,23 +112,16 @@
 								<view v-else-if="showType == 4">
 									<view class="mb-24 flex justify-between bgfot pd20" v-for="(item,index) in tempArr"
 										:key="index" @tap="goDetail(item)">
-										<easy-loadimage 
-											:image-src="item.image" 
-											:borderSrc="item.activity_frame.image"
-											width="176rpx" 
-											height="176rpx"
-											borderRadius="16rpx"></easy-loadimage>
+										<easy-loadimage :image-src="item.image" :borderSrc="item.activity_frame.image"
+											width="176rpx" height="176rpx" borderRadius="16rpx"></easy-loadimage>
 										<view class="flex-1 flex-col justify-between">
 											<view class="w-full">
-												<view class="line1 w-346 fs-28 colorfff lh-40rpx pl-12">{{item.store_name}}</view>
+												<view class="line1 w-346 fs-28 colorfff lh-40rpx pl-12">
+													{{item.store_name}}</view>
 												<view class="flex items-end flex-wrap mt-12 w-full">
-													<BaseTag
-														:text="label.label_name"
-														:color="label.color"
-														:background="label.bg_color"
-														:borderColor="label.border_color"
-														:circle="label.border_color ? true : false"
-														:imgSrc="label.icon"
+													<BaseTag :text="label.label_name" :color="label.color"
+														:background="label.bg_color" :borderColor="label.border_color"
+														:circle="label.border_color ? true : false" :imgSrc="label.icon"
 														v-for="(label, idx) in item.store_label" :key="idx"></BaseTag>
 												</view>
 											</view>
@@ -146,15 +138,14 @@
 													<image src="@/static/img/flgwc.png" mode="" class="wh44"></image>
 												</view>
 												<view v-if="!item.spec_type && !item.cart_num">
-													<view
-														class="flex-center w-48 h-48 rd-30rpx colorhui1 "
+													<view class="flex-center w-48 h-48 rd-30rpx colorhui1 "
 														@tap.stop="goCartDan(item,index)">
-														<image src="@/static/img/flgwc.png" mode="" class="wh44"></image>
+														<image src="@/static/img/flgwc.png" mode="" class="wh44">
+														</image>
 													</view>
 												</view>
 												<view class="flex-y-center" v-if="!item.spec_type && item.cart_num">
-													<view
-														class="flex-center w-48 h-48 rd-30rpx colorhui1"
+													<view class="flex-center w-48 h-48 rd-30rpx colorhui1"
 														@tap.stop="ChangeCartNumDan(false,index,item)">
 														<text class="iconfont icon-ic_Reduce fs-32"></text>
 													</view>
@@ -169,7 +160,7 @@
 									</view>
 								</view>
 								<view v-if="!tempArr.length && !loading">
-									<emptyPage title="暂无商品，去看点别的吧～" ></emptyPage>
+									<emptyPage title="暂无商品，去看点别的吧～"></emptyPage>
 								</view>
 								<view class="white-box"></view>
 							</scroll-view>
@@ -180,7 +171,8 @@
 			<view class="h-96 footer  bgfot" :class="isFooter == 1 ? 'show-footer' : ''">
 				<view class="w-100 h-100 rd-50rpx bg-color-huang flex-center abs-lt top-2 ml--4" @tap="openCart">
 					<image src="@/static/img/flgwc.png" class="wh100 colorhei"></image>
-					<uni-badge class="badge-style" :custom-style="{background: '#D64D22'}" v-if="cartNum > 0" :text="cartNum"></uni-badge>
+					<uni-badge class="badge-style" :custom-style="{background: '#D64D22'}" v-if="cartNum > 0"
+						:text="cartNum"></uni-badge>
 				</view>
 				<view class="w-710 h-full flex-between-center overflow cart_box" :class="{ open: footerOpen }">
 					<view class="flex-y-center" @tap="getCartList(0)">
@@ -191,7 +183,8 @@
 									class="iconfont icon-ic_uparrow fs-24"></text> </view> -->
 						</view>
 					</view>
-					<view class="w-186 h-72 lh-72rpx text-center rd-40rpx colorhei bg-color-huang fs-26 fw-500 bg-gradient1 mr-12"
+					<view
+						class="w-186 h-72 lh-72rpx text-center rd-40rpx colorhei bg-color-huang fs-26 fw-500 bg-gradient1 mr-12"
 						@tap="subOrder">去结算({{cartNum}})</view>
 				</view>
 			</view>
@@ -201,62 +194,65 @@
 						<!-- #ifdef MP -->
 						<view class="flex-1 h-58 flex-y-center rd-30rpx bg--w111-f5f5f5 px-32" @tap="goSearch">
 						<!-- #endif -->
-						<!-- #ifndef MP -->
-						<view class="w-full h-58 flex-y-center rd-30rpx bg--w111-f5f5f5 px-32" @tap="goSearch">
-						<!-- #endif -->
-							<text class="iconfont icon-ic_search fs-28"></text>
-							<text class="fs-24 text--w111-999 pl-18">请输入商品名称</text>
+							<!-- #ifndef MP -->
+							<view class="w-full h-58 flex-y-center rd-30rpx bg--w111-f5f5f5 px-32" @tap="goSearch">
+							<!-- #endif -->
+								<text class="iconfont icon-ic_search fs-28"></text>
+								<text class="fs-24 text--w111-999 pl-18">请输入商品名称</text>
+							</view>
+							<!-- 胶囊占据的位置 -->
+							<!-- #ifdef MP -->
+							<view class="ml-12" :style="'width:'+getHeight.barWidth+'px'"></view>
+							<!-- #endif -->
 						</view>
-						<!-- 胶囊占据的位置 -->
-						<!-- #ifdef MP -->
-						<view class="ml-12" :style="'width:'+getHeight.barWidth+'px'"></view>
-						<!-- #endif -->
 					</view>
-				</view>
-				<view class="pt-32 pl-30 pr-30">
-					<view>
-						<view class="fs-32 text--w111-333" v-if="categoryErList.length">
-							{{categoryErList[tabClick].cate_name}}
-						</view>
-						<view class="grid-column-4 grid-gap-24rpx mt-24">
-							<view class="w-154 h-56 rd-30rpx flex-center fs-24 text--w111-333 bg--w111-f5f5f5"
-								v-for="(item,index) in categoryErList" :key="index" @tap="longClick(index,item)"
-								:class="index===tabClick?'cate_active':''">
-								{{item.cate_name}}
+					<view class="pt-32 pl-30 pr-30">
+						<view>
+							<view class="fs-32 text--w111-333" v-if="categoryErList.length">
+								{{categoryErList[tabClick].cate_name}}
+							</view>
+							<view class="grid-column-4 grid-gap-24rpx mt-24">
+								<view class="w-154 h-56 rd-30rpx flex-center fs-24 text--w111-333 bg--w111-f5f5f5"
+									v-for="(item,index) in categoryErList" :key="index" @tap="longClick(index,item)"
+									:class="index===tabClick?'cate_active':''">
+									{{item.cate_name}}
+								</view>
 							</view>
 						</view>
-					</view>
-					<view class="flex-center fs-24 text--w111-999 h-80 mt-32" @tap="closeCateDrawer">
-						<text>点击收起 <text class="iconfont icon-ic_uparrow fs-24 pl-4"></text> </text>
+						<view class="flex-center fs-24 text--w111-999 h-80 mt-32" @tap="closeCateDrawer">
+							<text>点击收起 <text class="iconfont icon-ic_uparrow fs-24 pl-4"></text> </text>
+						</view>
 					</view>
 				</view>
+				<view class="mask" v-show="showCateDrawer" @tap="closeCateDrawer"></view>
+				<cartList :cartData="cartData" :isFooter='isFooter' @closeList="closeList"
+					@ChangeCartNumDan="ChangeCartList" @ChangeSubDel="ChangeSubDel" @ChangeOneDel="ChangeOneDel">
+				</cartList>
+				<productWindow :attr="attr" :isShow='1' :iSplus='1' :iScart='1' :is_vip="is_vip" :type="2"
+					@myevent="onMyEvent" @ChangeAttr="ChangeAttr" @ChangeCartNum="ChangeCartNumDuo" @attrVal="attrVal"
+					@iptCartNum="iptCartNum" @goCat="goCatNum" @getImg="showImg" id='product-window'></productWindow>
+				<cusPreviewImg ref="cusPreviewImg" :list="skuArr" @changeSwitch="changeSwitch"></cusPreviewImg>
+				<uni-popup ref="popup" type="center">
+					<view class="popupbox">
+							<text style="float: right;" class="iconfont iconfont icon-ic_close fs-44 colorhui1" @click="close"></text>
+							<image src="https://bar.jiuhaosh.cn/static/sbgx.png" mode="" class="popupboximg"></image>
+							<view class="neir">
+								购买商品需要成为会员 
+								<br />
+								才可以购买哦~
+							</view>
+							<view class="huiyuanbtn" @click="chuiyuan">我要充会员</view>
+					</view>
+				</uni-popup>
 			</view>
-			<view class="mask" v-show="showCateDrawer" @tap="closeCateDrawer"></view>
-			<cartList :cartData="cartData" :isFooter='isFooter' @closeList="closeList"
-				@ChangeCartNumDan="ChangeCartList" @ChangeSubDel="ChangeSubDel" @ChangeOneDel="ChangeOneDel">
-			</cartList>
-			<productWindow
-				:attr="attr"
-				:isShow='1'
-				:iSplus='1'
-				:iScart='1'
-				:is_vip="is_vip"
-				:type="2"
-				@myevent="onMyEvent"
-				@ChangeAttr="ChangeAttr"
-				@ChangeCartNum="ChangeCartNumDuo"
-				@attrVal="attrVal"
-				@iptCartNum="iptCartNum"
-				@goCat="goCatNum"
-				@getImg="showImg"
-				id='product-window' ></productWindow>
-			<cusPreviewImg ref="cusPreviewImg" :list="skuArr" @changeSwitch="changeSwitch"></cusPreviewImg>
-		</view>
 </template>
 
 <script>
 	let windowHeight = uni.getSystemInfoSync().screenHeight;
 	let sysHeight = uni.getSystemInfoSync().statusBarHeight;
+	import {
+		getUserInfo
+	} from '@/api/user.js';
 	import {
 		getCategoryList,
 		getProductslist,
@@ -289,14 +285,15 @@
 				type: Number,
 				default: 1
 			},
-			isFooter:{
+			isFooter: {
 				type: Boolean,
 				default: false
 			}
 		},
 		data() {
 			return {
-				windowHeight: this.isFooter?windowHeight:windowHeight-50,
+				userInfo: {},
+				windowHeight: this.isFooter ? windowHeight : windowHeight - 50,
 				showCateDrawer: false,
 				sysHeight: sysHeight,
 				categoryList: [],
@@ -343,7 +340,7 @@
 				selectSku: {},
 				skuArr: [],
 				getHeight: this.$util.getWXStatusHeight(),
-				footerOpen:true
+				footerOpen: true
 			}
 		},
 		components: {
@@ -360,11 +357,12 @@
 			...mapGetters(['isLogin', 'uid', 'cartNum']),
 		},
 		mounted() {
+			this.getUserInfo()
 			this.getAllCategory();
 			setTimeout(() => {
 				this.getScrollHeight();
 			}, 500)
-			if(this.isLogin){
+			if (this.isLogin) {
 				this.getCartList(1);
 			}
 			uni.$off('newAttrNum');
@@ -391,8 +389,8 @@
 							}
 						})
 					})
-					this.cartData.cartList.forEach((item)=>{
-						data.forEach(j=>{
+					this.cartData.cartList.forEach((item) => {
+						data.forEach(j => {
 							if (item.id == j.id) {
 								item.cart_num = 0
 							}
@@ -403,10 +401,11 @@
 			})
 		},
 		methods: {
-			openCart(){
-				if(this.footerOpen){
+		
+			openCart() {
+				if (this.footerOpen) {
 					this.getCartList(0)
-				}else{
+				} else {
 					this.footerOpen = true
 				}
 			},
@@ -418,10 +417,10 @@
 				let that = this;
 				getCategoryList().then(res => {
 					if (!res.data.length) return
-					res.data.map(item=>{
-						if(item.children && item.children.length){
+					res.data.map(item => {
+						if (item.children && item.children.length) {
 							item.children.unshift({
-								id:item.id,
+								id: item.id,
 								cate_name: '全部商品'
 							})
 						}
@@ -515,25 +514,47 @@
 				})
 				return list.includes(0) ? true : false
 			},
+			/*
+			 * 获取用户信息
+			 */
+			getUserInfo: function() {
+				console.log(123);
+				let that = this;
+				getUserInfo().then(res => {
+					that.userInfo = res.data;
+				});
+			},
+			chuiyuan(){
+				uni.navigateTo({
+					url:'/pages/annex/vip_paid/index'
+				})
+			},
+			close(){
+				this.$refs.popup.close('center')
+			},
 			// 生成订单；
 			subOrder() {
-				let that = this,
-					list = that.cartData.cartList,
-					ids = [];
-				if (list.length) {
-					list.forEach(item => {
-						if (item.attrStatus && item.status) {
-							ids.push(item.id)
-						}
-					});
-					uni.navigateTo({
-						url: '/pages/goods/order_confirm/index?cartId=' + ids.join(',')
-					});
-					that.cartData.iScart = false;
+				if (!this.userInfo.pay_vip_status) {
+					this.$refs.popup.open('center')
 				} else {
-					return that.$util.Tips({
-						title: '请选择产品'
-					});
+					let that = this,
+						list = that.cartData.cartList,
+						ids = [];
+					if (list.length) {
+						list.forEach(item => {
+							if (item.attrStatus && item.status) {
+								ids.push(item.id)
+							}
+						});
+						uni.navigateTo({
+							url: '/pages/goods/order_confirm/index?cartId=' + ids.join(',')
+						});
+						that.cartData.iScart = false;
+					} else {
+						return that.$util.Tips({
+							title: '请选择产品'
+						});
+					}
 				}
 			},
 			// 计算总价；
@@ -573,8 +594,8 @@
 					this.$store.commit('indexData/setCartNum', res.data.count)
 					this.totalPrice = res.data.sum_price;
 					// 删除购物车回到分类页确保数据更新
-					if(res.data.count<=0){
-						this.tempArr.forEach((item)=>{
+					if (res.data.count <= 0) {
+						this.tempArr.forEach((item) => {
 							item.cart_num = 0
 						})
 					}
@@ -669,21 +690,58 @@
 </script>
 
 <style lang="scss" scoped>
-	/deep/.base-tag{
+	.popupbox{
+		width: 600rpx;
+		height: 500rpx;
+		background: #1C1A1F;
+		box-shadow: 0rpx 5rpx 16rpx 0rpx rgba(6,3,14,0.39);
+		border-radius: 20rpx;
+		padding: 20rpx;
+		text-align: center;
+		.popupboximg{
+			width: 171rpx;
+			height: 189rpx;
+			margin: 0 auto;
+		}
+		.neir{
+			font-family: Alibaba PuHuiTi;
+			font-weight: 400;
+			font-size: 36rpx;
+			color: #FFFFFF;
+			line-height: 56rpx;
+			text-align: center;
+		}
+		.huiyuanbtn{
+			width: 400rpx;
+			height: 80rpx;
+			background: #F8BF1F;
+			border-radius: 40rpx;
+			margin: 50rpx auto;
+			font-family: Alibaba PuHuiTi;
+			font-weight: 400;
+			font-size: 30rpx;
+			text-align: center;
+			color: #080313;
+			line-height: 80rpx;
+		}
+	}
+	/deep/.base-tag {
 		background-color: #f5f5f5;
 	}
-	.bntCon{
+
+	.bntCon {
 		position: relative;
-		&:before{
+
+		&:before {
 			position: absolute;
 			content: '';
 			width: 6rpx;
 			height: 80rpx;
-			background: radial-gradient( rgba(0,0,0,0.082) 0%, rgba(0,0,0,0) 100%);
-			left:-22rpx;
+			background: radial-gradient(rgba(0, 0, 0, 0.082) 0%, rgba(0, 0, 0, 0) 100%);
+			left: -22rpx;
 		}
 	}
-	
+
 	.scroll_box {
 		overflow: hidden;
 	}
@@ -709,7 +767,7 @@
 			// transform: translateY(-50%);
 			// border-radius: 0 10rpx 10rpx 0;
 		}
-		
+
 		// .top-ra{
 		// 	width: 32rpx;
 		// 	height: 32rpx;
@@ -753,8 +811,8 @@
 		background: var(--view-minorColorT);
 		border: 1rpx solid var(--view-theme);
 	}
-	
-	.footer{
+
+	.footer {
 		position: fixed;
 		/* #ifdef H5 */
 		bottom: 140rpx;
@@ -773,12 +831,13 @@
 		background-color: #1B1A1D;
 		padding-left: 94rpx;
 		transition: 0.3s;
-		&.open{
+
+		&.open {
 			width: 710rpx;
 		}
 	}
 
-	.show-footer{
+	.show-footer {
 		/* #ifdef MP || APP-PLUS */
 		bottom: calc(140rpx + env(safe-area-inset-bottom));
 		/* #endif */
@@ -841,20 +900,24 @@
 	.w-346 {
 		width: 346rpx;
 	}
+
 	.badge-style {
 		position: absolute;
 		top: -2rpx;
 		right: -14rpx;
+
 		/deep/ .uni-badge--error {
 			background-color: var(--view-theme) !important;
 		}
+
 		.uni-badge {
 			color: var(--view-theme);
 			border: 1px solid var(--view-theme);
 			z-index: 29;
 		}
 	}
-	.white-box{
+
+	.white-box {
 		height: calc(300rpx + env(safe-area-inset-bottom));
 	}
-</style>
+</style>
\ No newline at end of file
diff --git a/pages/goods_details/components/preferentialModal/index.vue b/pages/goods_details/components/preferentialModal/index.vue
index 027e41f..cf3ed68 100644
--- a/pages/goods_details/components/preferentialModal/index.vue
+++ b/pages/goods_details/components/preferentialModal/index.vue
@@ -71,8 +71,8 @@ export default {
 	<view>
 		<base-drawer mode="bottom" :visible="visible" background-color="transparent" mask maskClosable @close="closeDrawer">
 			
-			<view class="w-full bg--w111-f5f5f5 rd-t-40rpx py-32">
-				<view class="text-center fs-32 text--w111-333 fw-500">优惠</view>
+			<view class="w-full bgfot rd-t-40rpx py-32">
+				<view class="text-center fs-32 colorfff fw-500">优惠</view>
 				<view class="mt-48 px-20">
 					<scroll-view scroll-y="true" style="height: 800rpx;">
 						<view v-if="computedPrice.deduction && computedPrice.deduction.sum_price > computedPrice.deduction.pay_price">
diff --git a/pages/goods_details/index.vue b/pages/goods_details/index.vue
index 00cadfe..2531907 100644
--- a/pages/goods_details/index.vue
+++ b/pages/goods_details/index.vue
@@ -128,8 +128,9 @@
 												integerSize="48"
 												preFix="到手价"
 												preFixSize="22"
+												color='#D64D22'
 												decimalSize="32" weight></baseMoney>
-											<view class="fs-22 text--w111-3d3d3d pl-12"> 售价{{ attr.productSelect.price }} </view>
+											<view class="fs-22 colorhui1 pl-12"> 售价 <text class="colorzong">{{ attr.productSelect.price }}</text>  </view>
 										</view>
 										<baseMoney
 										    v-else
@@ -474,7 +475,8 @@
 						</view>
 						<view class="rd-24rpx bg--w111-fff mt-20" id="past3" style="background: #1B1A1D;text-align:center">
 							<view class="fs-30 fw-500 lh-40rpx flex-center py-32 colorhui1">商品详情</view>
-							<image :src="storeInfo.slider_image" mode=""></image>
+							<!-- <image :src="storeInfo.slider_image" mode=""></image> -->
+							<jyf-parser :html="description" ref="article" :tag-style="tagStyle"></jyf-parser>
 						</view>
 						<view class="pb-safe h-148"></view>
 						<!-- 服务抽屉 -->
@@ -934,6 +936,7 @@
 				this.storeLists = null;
 			}
 			this.getUserInfo()
+			this.store_id=uni.getStorageSync('mendianstore_id')
 		},
 		mounted(){
 			uni.$off('activeFn');
diff --git a/pages/index/components/goodList.vue b/pages/index/components/goodList.vue
index f2870cc..5a8c4b9 100644
--- a/pages/index/components/goodList.vue
+++ b/pages/index/components/goodList.vue
@@ -412,6 +412,10 @@ import {
 export default {
   name: 'goodList',
   props: {
+	  pagegd:{
+      type: String | Number,
+      default: 0
+    },
 	  mdid:'',
     dataConfig: {
       type: Object,
@@ -451,7 +455,10 @@ export default {
   watch: {
 	  mdid(){
 		  console.log('门店切换')
-		   this.productslist();
+		   this.productslist(1);
+	  },
+	  pagegd(){
+		  this.productslist(this.pagegd)
 	  },
     // 监听列表数据变化
     tempArr:  {
@@ -504,7 +511,7 @@ export default {
       }
     },
     dataConfig() {
-      this.productslist();
+      this.productslist(1);
     }
   },
   computed:{
@@ -628,7 +635,7 @@ export default {
     // #endif
   },
   mounted() {
-    this.productslist();
+    this.productslist(1);
   },
   methods: {
     observeVideo() {
@@ -641,7 +648,7 @@ export default {
         }
       });
     },
-    productslist() {
+    productslist(page) {
       let limit = this.$config.LIMIT;
       let data = {};
       if (this.typeConfig == 1) {
@@ -661,6 +668,7 @@ export default {
       // getProductslist(data).then(res => {
       //   this.tempArr = res.data;
       // });
+	  console.log('page',page);
 	  storegetProducts({
 	  	sid: 0,
 	  	// keyword: '',
@@ -669,14 +677,18 @@ export default {
 	  	// news: 0,
 	  	type:1,
 	  	tid:0,
-	  	page: 1,
+	  	page:page,
 	  	limit: 10,
 	  	cid: 0,
 	  	store_id:this.mdid
 	  }).then(res => {
-	  	 this.tempArr = res.data;
+		var goodList=res.data
+	  	this.tempArr=[...this.tempArr,...goodList];
 	  });
     },
+	onReachBottom() {
+		console.log(998);
+	},
     goDetail(item) {
       goShopDetail(item, this.$store.state.app.uid).catch(res => {
         uni.navigateTo({
diff --git a/pages/index/index.vue b/pages/index/index.vue
index 039c093..a2cc3ba 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -41,7 +41,7 @@
 					<customerService v-if="item.name == 'customerService'" :dataConfig="item">
 					</customerService>
 					<!-- 商品列表 -->
-					<goodList v-if="item.name == 'goodList'" :dataConfig="item" :splist='splist' :mdid='mdid'></goodList>
+					<goodList v-if="item.name == 'goodList'" :dataConfig="item" :splist='splist' :mdid='mdid'  :pagegd='pagegd'></goodList>
 					<guide v-if="item.name == 'guide'" :dataConfig="item"></guide>
 					<!-- 直播模块 -->
 					<!-- #ifdef  MP-WEIXIN -->
@@ -369,7 +369,8 @@
 				},
 				mdlist:[],
 				mdid:'',
-				mrmd:''
+				mrmd:'',
+				pagegd:1
 			};
 		},
 		onLoad(options) {
@@ -462,6 +463,7 @@
 			uni.removeStorageSync('form_type_cart');
 			// 优惠券弹窗
 			if (this.isLogin) {
+				// this.$refs.popup.open('center')
 				console.log(154,this.userInfo)
 				this.$nextTick(() => {
 					if(this.userInfo.overdue_day<15){
@@ -475,9 +477,9 @@
 					this.$refs.popup.open('center')
 				}
 			}
-			if(!this.userInfo.overdue_day){
-				this.$refs.popup.open('center')
-			}
+			// if(!this.userInfo.overdue_day){
+			// 	this.$refs.popup.open('center')
+			// }
 			if(uni.getStorageSync('mdnane')!=''){
 				uni.setStorageSync('mendianstore_id','')
 				this.mrmd=uni.getStorageSync('mdnane')
@@ -491,11 +493,11 @@
 		},
 		onReady() {},
 		methods: {
-			saoma(){
-				uni.navigateTo({
-					url:'/pages/store/table_code/index?store_id=1&qrcode_id=2'
-				})
-			},
+			// saoma(){
+			// 	uni.navigateTo({
+			// 		url:'/pages/store/table_code/index?store_id=1&qrcode_id=3'
+			// 	})
+			// },
 			getLocation(){
 				var that=this
 				uni.getLocation({
@@ -947,7 +949,9 @@
 			}
 			// #endif
 		},
-		onReachBottom() {
+		onReachBottom() { 
+				console.log(9989);
+				this.pagegd++
 			this.getGoodsList();
 		},
 		onPageScroll(e) {
@@ -1061,6 +1065,7 @@
 		font-weight: 400;
 		font-size: 28rpx;
 		color: #080313;
+		z-index: 9999;
 	}
 	.inputserch {
 		width: 550rpx;
diff --git a/pages/order_addcart/order_addcart.vue b/pages/order_addcart/order_addcart.vue
index 0bfac51..aa3adeb 100644
--- a/pages/order_addcart/order_addcart.vue
+++ b/pages/order_addcart/order_addcart.vue
@@ -113,10 +113,10 @@
 			<view class="pt-20" v-if="cartList.valid.length == 0 && loadend">
 				<emptyPage title="暂无商品，去加点别的吧～"></emptyPage>
 			</view>
-			<!-- <view class="rd-24rpx  bg--w111-fff mt-20 pt-32" v-if="cartList.invalid.length > 0">
+			<view class="rd-24rpx bgfot mt-20 pt-32" v-if="cartList.invalid.length > 0">
 				<view class="px-24 flex-between-center">
-					<text class="fs-28  text--w111-333 lh-40rpx fw-500">失效商品({{cartList.invalid.length}})</text>
-					<text class="fs-24 lh-28rpx  text--w111-999" @click='unsetCart'>一键清空</text>
+					<text class="fs-28  colorhui1 lh-40rpx fw-500">失效商品({{cartList.invalid.length}})</text>
+					<text class="fs-24 lh-28rpx  colorhui1" @click='unsetCart'>一键清空</text>
 				</view>
 				<view class="mt-24 px-24">
 					<view class="flex-between-center py-28" v-for="(item,ind) in cartList.invalid" :key='ind'>
@@ -130,19 +130,19 @@
 							<view class="ml-20">
 								<view class="w-382 line1 fs-28 fw-500 text--w111-ccc lh-40rpx">{{item.productInfo.store_name}}</view>
 								<view
-									class="inline-block h-38 lh-38rpx mt-12  bg--w111-f5f5f5  text--w111-ccc rd-20rpx px-12 text-center fs-22">
+									class="inline-block h-38 lh-38rpx mt-12  bgfot1 colorhui  rd-20rpx px-12 text-center fs-22">
 									<view class="flex" v-if="item.productInfo.attrInfo">
 										<text>{{item.productInfo.attrInfo.suk}}</text>
 										<text class="iconfont icon-ic_downarrow fs-24 ml-12"></text>
 									</view>
 								</view>
 								<view class="flex my-20">
-									<view
+									<!-- <view
 										class="h-26 lh-22rpx px-6 rd-4rpx fs-18 bg--w111-fff disabled-tag"  v-if="item.productInfo.freight == 1">
 										包邮</view>
 									<view
 										class="h-26 lh-22rpx px-6 rd-4rpx fs-18 bg--w111-fff disabled-tag ml-8">
-										7天无理由</view>
+										7天无理由</view> -->
 								</view>
 								<view class="flex-between-center text--w111-bbb fs-22">
 									{{item.invalid_desc}}
@@ -151,7 +151,7 @@
 						</view>
 					</view>
 				</view>
-			</view> -->
+			</view>
 		</view>
 		<view class='px-20'>
 			<!-- 热门推荐显示 -->
@@ -240,6 +240,18 @@
 			@ruleToggle="ruleToggle"
 			v-if="coupon">
 		</couponListWindow>
+		<uni-popup ref="popup" type="center">
+			<view class="popupbox">
+					<text style="float: right;" class="iconfont iconfont icon-ic_close fs-44 colorhui1" @click="close"></text>
+					<image src="https://bar.jiuhaosh.cn/static/sbgx.png" mode="" class="popupboximg"></image>
+					<view class="neir">
+						购买商品需要成为会员 
+						<br />
+						才可以购买哦~
+					</view>
+					<view class="huiyuanbtn" @click="chuiyuan">我要充会员</view>
+			</view>
+		</uni-popup>
 	</view>
 </template>
 
@@ -271,6 +283,9 @@
 	import {
 		toLogin
 	} from '@/libs/login.js';
+	import {
+		getUserInfo
+	} from '@/api/user.js';
 	import {
 		mapGetters
 	} from "vuex";
@@ -297,6 +312,7 @@
 		mixins: [colors],
 		data() {
 			return {
+				userInfo:{},
 				isFooter: false,
 				isTips: false,
 				//属性是否打开
@@ -409,6 +425,7 @@
 				this.getHostProduct();
 		},
 		onShow: function() {
+			
 			uni.setStorageSync('form_type_cart', 1);
 			if (this.cartNum > 0) {
 				uni.setTabBarBadge({
@@ -429,6 +446,7 @@
 			} else {
 				toLogin()
 			}
+			this.getUserInfo()
 		},
 		methods: {
 			onLoadFun() {
@@ -830,7 +848,28 @@
 					});
 				}
 			},
+			/*
+			 * 获取用户信息
+			 */
+			getUserInfo: function() {
+				console.log(123);
+				let that = this;
+				getUserInfo().then(res => {
+					that.userInfo = res.data;
+				});
+			},
+			chuiyuan(){
+				uni.navigateTo({
+					url:'/pages/annex/vip_paid/index'
+				})
+			},
+			close(){
+				this.$refs.popup.close('center')
+			},
 			subOrder(event) {
+				if (!this.userInfo.pay_vip_status) {
+					this.$refs.popup.open('center')
+				} else {
 				let that = this,
 					selectValue = that.selectValue,
 					delivery_type = 1,
@@ -873,6 +912,8 @@
 						title: '请选择产品'
 					});
 				}
+				
+				}
 			},
 			checkboxAllChange: function(event) {
 				let value = event.detail.value;
@@ -1352,6 +1393,41 @@
 	}
 </script>
 <style scoped lang="scss">
+	.popupbox{
+		width: 600rpx;
+		height: 500rpx;
+		background: #1C1A1F;
+		box-shadow: 0rpx 5rpx 16rpx 0rpx rgba(6,3,14,0.39);
+		border-radius: 20rpx;
+		padding: 20rpx;
+		text-align: center;
+		.popupboximg{
+			width: 171rpx;
+			height: 189rpx;
+			margin: 0 auto;
+		}
+		.neir{
+			font-family: Alibaba PuHuiTi;
+			font-weight: 400;
+			font-size: 36rpx;
+			color: #FFFFFF;
+			line-height: 56rpx;
+			text-align: center;
+		}
+		.huiyuanbtn{
+			width: 400rpx;
+			height: 80rpx;
+			background: #F8BF1F;
+			border-radius: 40rpx;
+			margin: 50rpx auto;
+			font-family: Alibaba PuHuiTi;
+			font-weight: 400;
+			font-size: 30rpx;
+			text-align: center;
+			color: #080313;
+			line-height: 80rpx;
+		}
+	}
 	/deep/.tui-swipeout-wrap{
 		border-radius: 0 0 24rpx 0;
 	}
diff --git a/pages/store/list/index.vue b/pages/store/list/index.vue
index ca3c65c..6c19715 100644
--- a/pages/store/list/index.vue
+++ b/pages/store/list/index.vue
@@ -105,9 +105,11 @@
 			};
 		},
 		onLoad(options) {
+			uni.setStorageSync('isCollagemendian',options.storeId)
 			this.comeType = options.type
 			this.sortIndex = options.storeId
 			this.isCollage = options.isCollage
+			console.log('this.isCollage',this.isCollage);
 			this.content.product_id = options.product_id || 0
 			this.getlist()
 		},
@@ -159,6 +161,9 @@
 			},
 			// 点击高亮
 			activeFn(row) {
+				if(this.isCollage){
+					uni.setStorageSync('isCollagemendian',row.id)
+				}
 				this.sortIndex = row.id
 				console.log(111,row);
 				uni.setStorageSync('mdnane','')
@@ -166,6 +171,7 @@
 				uni.setStorageSync('mdnane',row.name)
 				uni.setStorageSync('mdid',row.id)
 				uni.navigateBack()
+				
 			},
 			// 打电话
 			callPhone(row) {
diff --git a/pages/store/table_code/index.vue b/pages/store/table_code/index.vue
index 8ee0985..9985eec 100644
--- a/pages/store/table_code/index.vue
+++ b/pages/store/table_code/index.vue
@@ -206,9 +206,18 @@
 												this.number_diners=res.data.number_diners
 												this.changeTable();
 											});
-								} else {
-									this.getStore();
-								}
+								} 
+								// else {
+								// 	this.getStore();
+								// }
+								if(res.cancel){
+										// uni.navigateTo({
+										// 	url:'/pages/store/table_code/index?store_id='+this.info.store_id+'&qrcode_id='+this.info.qrcode_id+'&tableId'+this.info.tableId
+										// })
+										uni.switchTab({
+											url:'/pages/index/index'
+										})
+									}
 							}
 						});
 					}
diff --git a/pages/user/components/menus/template1.vue b/pages/user/components/menus/template1.vue
index b2db8c9..635eb1c 100644
--- a/pages/user/components/menus/template1.vue
+++ b/pages/user/components/menus/template1.vue
@@ -1,13 +1,13 @@
 <script>
-export default {
-	inject: ['goMenuPage'],
-	props: {
-		menuData: {
-			type: Object,
-			default: () => {}
+	export default {
+		inject: ['goMenuPage'],
+		props: {
+			menuData: {
+				type: Object,
+				default: () => {}
+			}
 		}
-	}
-};
+	};
 </script>
 
 <template>
@@ -15,9 +15,18 @@ export default {
 		<view class="pt-34 pb-36 bgfot rd-16rpx mt-20 service ml-20 mr-20">
 			<view class="fs-30 fw-500 lh-42rpx colorfff pl-32">{{ menuData.title }}</view>
 			<view class="grid-column-4 grid-gap-x-40rpx grid-gap-y-54rpx mt-38 pl-14 pr-14">
-				<view class="flex-col flex-center" v-for="(item, index) in menuData.list" :key="index" @click="goMenuPage(item.url, item.name)">
-					<image :src="item.pic" class="image"></image>
-					<text class="fs-26 lh-36rpx colorhui1 pt-22">{{ item.name }}</text>
+				<view class="flex-col flex-center" v-for="(item, index) in menuData.list" :key="index"
+					@click="goMenuPage(item.url, item.name)">
+					<view class="flex-col flex-center" v-if="item.name!='联系客服'">
+						<image :src="item.pic" class="image"></image>
+						<text class="fs-26 lh-36rpx colorhui1 pt-22">{{ item.name }}
+						</text>
+					</view>
+					<button class="flex-col flex-center backbtn" v-else open-type="contact">
+						<image :src="item.pic" class="image"></image>
+						<text class="fs-26 lh-36rpx colorhui1 pt-22">{{ item.name }}
+						</text>
+					</button>
 				</view>
 			</view>
 		</view>
@@ -25,10 +34,16 @@ export default {
 </template>
 
 <style scoped lang="scss">
-.service {
-	.image {
-		width: 48rpx;
-		height: 48rpx;
+	button::after{
+		border: none; 
+	}
+	.backbtn{
+		background: #1B1A1D;
+	}
+	.service {
+		.image {
+			width: 48rpx;
+			height: 48rpx;
+		}
 	}
-}
-</style>
+</style>
\ No newline at end of file
diff --git a/pages/user/index.vue b/pages/user/index.vue
index ac14714..f183f76 100644
--- a/pages/user/index.vue
+++ b/pages/user/index.vue
@@ -533,6 +533,9 @@ export default {
 			});
 		},
 		goMenuPage(url, name) {
+			if(name=='联系客服'){
+				return
+			}
 			console.log(url);
 			if (this.isLogin) {
 				let arr = url.split('@APPID=');
diff --git a/pages/users/promoter-list/index.vue b/pages/users/promoter-list/index.vue
index 94ece2b..3c47b07 100644
--- a/pages/users/promoter-list/index.vue
+++ b/pages/users/promoter-list/index.vue
@@ -1,5 +1,9 @@
 <template>
-	<view :style="colorStyle">
+	<view>
+		<view class="topdaohang" @click="fanhui">
+			<uni-icons type="left" size="18" color="white"></uni-icons>
+			<text>我的推广</text>
+		</view>
 		<view class="promoter-list">
 			<view class="header">
 				<view class='search acea-row row-middle'>
@@ -13,7 +17,7 @@
 				<timeSlot @changeTime="changeTime"></timeSlot>
 			</view>
 			<view class='list' v-if="recordList.length">
-				<view class="top_num">
+				<view class="top_num colorfff">
 					共 <text class="main_color">{{count}}</text> 位推广人，获得佣金<text class="main_color">¥{{price}}</text>
 				</view>
 				<view class="itemCon">
@@ -100,6 +104,9 @@
 			this.is_show = true;
 		},
 		methods: {
+			fanhui(){
+				uni.navigateBack()
+			},
 			changeTime(time) {
 				console.log(time)
 				this.start = time.start
@@ -188,10 +195,15 @@
 </script>
 
 <style scoped lang="scss">
+	.promoter-list{
+		margin-top: 60rpx;
+		
+	}
 	.empty{
 		margin: 20rpx;
 	}
 	.promoter-list .nav {
+		
 		background-color: #fff;
 		height: 92rpx;
 		line-height: 86rpx;
@@ -222,7 +234,6 @@
 	}
 
 	.promoter-list .header {
-		background-color: #fff;
 		padding-top: 24rpx;
 	}
 
@@ -231,9 +242,10 @@
 		height: 72rpx;
 		padding: 0 32rpx;
 		box-sizing: border-box;
-		background-color: #F5F5F5;
+		background-color: #1B1A1D;
 		border-radius: 50rpx;
-		margin: 0 auto 10rpx auto;
+		margin: 0 auto 24rpx auto;
+		color: #fff;
 
 		.placeholder {
 			color: #ccc;
@@ -272,7 +284,7 @@
 	}
 
 	.promoter-list .list .itemCon {
-		background-color: #fff;
+		background-color: #272629;
 		margin: 0 20rpx;
 		border-radius: 24rpx;
 	}
@@ -280,9 +292,9 @@
 	.promoter-list .list .item {
 		height: 176rpx;
 		font-size: 24rpx;
-		color: #666;
+		color: #fff;
 		margin: 0 24rpx;
-		border-bottom: 1px solid #EEEEEE;
+		// border-bottom: 1px solid #EEEEEE;
 	}
 
 	.promoter-list .list .item .picTxt {
@@ -309,7 +321,7 @@
 
 	.promoter-list .list .item .picTxt .text .name {
 		font-size: 28rpx;
-		color: #333;
+		// color: #333;
 		margin-bottom: 13rpx;
 	}
 
@@ -317,7 +329,6 @@
 		width: 190rpx;
 		text-align: right;
 		font-size: 24rpx;
-		color: #333;
 	}
 
 	.promoter-list .list .item .right .num {
@@ -327,7 +338,7 @@
 	.top_num {
 		padding: 14rpx 20rpx 28rpx 20rpx;
 		font-size: 24rpx;
-		color: #666;
+		// color: #666;
 	}
 
 	.main_color {
diff --git a/pages/users/user_address/index.vue b/pages/users/user_address/index.vue
index 875b36f..d1576d0 100644
--- a/pages/users/user_address/index.vue
+++ b/pages/users/user_address/index.vue
@@ -19,7 +19,8 @@
 				</view>
 				<!-- #endif -->
 				<!-- #ifdef H5 -->
-				<view v-if="this.$wechat.isWeixin() && !id" class="wechatAddress acea-row row-between-wrapper" @click="getAddress">
+				<view v-if="this.$wechat.isWeixin() && !id" class="wechatAddress acea-row row-between-wrapper"
+					@click="getAddress">
 					<view class="acea-row row-middle"><text class="iconfont icon-ic_wechat"></text>获取微信收货地址</view>
 					<text class="iconfont icon-ic_rightarrow"></text>
 				</view>
@@ -28,11 +29,13 @@
 					<view class='list'>
 						<view class='item acea-row row-between-wrapper'>
 							<view class='name'>姓名</view>
-							<input type='text' style="color: #fff;" placeholder='请输入姓名' name='real_name' :value="userAddress.real_name" placeholder-class='placeholder'></input>
+							<input type='text' style="color: #fff;" placeholder='请输入姓名' name='real_name'
+								:value="userAddress.real_name" placeholder-class='placeholder'></input>
 						</view>
 						<view class='item acea-row row-between-wrapper'>
 							<view class='name'>联系电话</view>
-							<input style="color: #fff;" type='number' maxlength="11" placeholder='请输入联系电话' name="phone" :value='userAddress.phone' placeholder-class='placeholder' pattern="\d*"></input>
+							<input style="color: #fff;" type='number' maxlength="11" placeholder='请输入联系电话' name="phone"
+								:value='userAddress.phone' placeholder-class='placeholder' pattern="\d*"></input>
 						</view>
 						<view class='item acea-row row-between-wrapper'>
 							<view class='name'>所在地区</view>
@@ -48,14 +51,15 @@
 									<text class="colorfff">
 										定位
 									</text>
-									
+
 								</view>
 							</view>
 						</view>
 						<view class='item acea-row row-between-wrapper'>
 							<view class='name'>详细地址</view>
 							<view class="address">
-								<input style="color: #fff;" type='text' placeholder='请填写具体地址' name='detail' placeholder-class='placeholder' :value='userAddress.detail' class="detail"></input>
+								<input style="color: #fff;" type='text' placeholder='请填写具体地址' name='detail'
+									placeholder-class='placeholder' :value='userAddress.detail' class="detail"></input>
 							</view>
 						</view>
 					</view>
@@ -75,7 +79,8 @@
 				<button class='keepBnt bg-color-huang' form-type="submit">立即保存</button>
 			</view>
 		</form>
-		<areaWindow ref="areaWindow" :display="display" :address="addressInfo" @submit="OnChangeAddress" @changeClose="changeClose"></areaWindow>
+		<areaWindow ref="areaWindow" :display="display" :address="addressInfo" @submit="OnChangeAddress"
+			@changeClose="changeClose"></areaWindow>
 	</view>
 </template>
 
@@ -107,7 +112,7 @@
 		mixins: [colors],
 		data() {
 			return {
-				navgback:false,
+				navgback: false,
 				cartId: '', //购物车id
 				pinkId: 0, //拼团id
 				couponId: 0, //优惠券id
@@ -131,7 +136,7 @@
 				store_name: '', //门店名称
 				storeId: 0, //门店id
 				product_id: 0, //商品id
-				fromType:0 //主要用于判断从商品详情跳转过来的
+				fromType: 0 //主要用于判断从商品详情跳转过来的
 			};
 		},
 		computed: {
@@ -153,9 +158,16 @@
 			}
 		},
 		onLoad(options) {
-			if(options.dalibaodz=='dalibaodz'){
-				this.navgback=true
+			if (options.dalibaodz == 'dalibaodz') {
+				this.navgback = true
 			}
+			console.log(858,options);
+			this.huiyuanka=options.huiyuanka
+			this.huiyuankajiage=options.huiyuankajiage
+			this.huiyuanzhekou=options.huiyuanzhekou
+			this.vipmoney=options.vipmoney
+			this.vipprice=options.vipprice
+			this.member_type=options.member_type
 			this.cartId = options.cartId || '';
 			this.pinkId = options.pinkId || 0;
 			this.couponId = options.couponId || 0;
@@ -181,7 +193,7 @@
 			uni.removeStorageSync('form_type_cart');
 		},
 		methods: {
-			fanhui(){
+			fanhui() {
 				uni.navigateBack()
 			},
 			onLoadFun() {
@@ -246,10 +258,14 @@
 							long: longitude
 						}).then(res => {
 							const data = res.data;
-							getCityList(data.address_component.province + '/' + data.address_component.city + '/' + data.address_component.district + '/' + (!data
-								.address_reference.town ? '' : data.address_reference.town.title)).then(res => {
+							getCityList(data.address_component.province + '/' + data
+								.address_component.city + '/' + data.address_component
+								.district + '/' + (!data
+									.address_reference.town ? '' : data.address_reference.town
+									.title)).then(res => {
 								self.addressInfo = res.data;
-								self.userAddress.detail = data.formatted_addresses.recommend;
+								self.userAddress.detail = data.formatted_addresses
+									.recommend;
 							}).catch(err => {
 								self.$util.Tips({
 									title: err
@@ -282,8 +298,10 @@
 							long: longitude
 						}).then(res => {
 							const data = res.data;
-							getCityList(data.address_component.province + '/' + data.address_component.city + '/' + data.address_component.district + '/' + (!data.address_reference
-								.town ? '' : data.address_reference.town.title)).then(res => {
+							getCityList(data.address_component.province + '/' + data.address_component
+								.city + '/' + data.address_component.district + '/' + (!data
+									.address_reference
+									.town ? '' : data.address_reference.town.title)).then(res => {
 								self.addressInfo = res.data;
 								self.userAddress.detail = data.formatted_addresses.recommend;
 								uni.hideLoading();
@@ -308,9 +326,10 @@
 					success: function(res) {
 						uni.chooseAddress({
 							success: function(res) {
-								getCityList(res.provinceName + '/' + res.cityName + '/' + res.countyName + '/' + res.streetName).then(res => {
+								getCityList(res.provinceName + '/' + res.cityName + '/' + res
+									.countyName + '/' + res.streetName).then(res => {
 									that.addressInfo = res.data;
-								}).catch(err=>{
+								}).catch(err => {
 									return that.$util.Tips({
 										title: err
 									});
@@ -350,7 +369,8 @@
 			getAddress() {
 				let that = this;
 				that.$wechat.openAddress().then(res => {
-					getCityList(res.provinceName + '/' + res.cityName + '/' + res.countryName + '/' + res.streetName).then(res => {
+					getCityList(res.provinceName + '/' + res.cityName + '/' + res.countryName + '/' + res
+						.streetName).then(res => {
 						that.addressInfo = res.data;
 					})
 					that.userAddress.real_name = res.userName;
@@ -398,7 +418,8 @@
 					city: regionArray[1].label,
 					district: regionArray[2].label,
 					street: regionArray[3] ? regionArray[3].label : '',
-					city_id: regionArray[regionArray.length - 1].id ? regionArray[regionArray.length - 1].id : that.city_id,
+					city_id: regionArray[regionArray.length - 1].id ? regionArray[regionArray.length - 1].id : that
+						.city_id,
 				};
 				value.is_default = that.userAddress.is_default ? 1 : 0;
 				// 经度
@@ -421,10 +442,9 @@
 							icon: 'success'
 						});
 					setTimeout(function() {
-						if(that.navgback){
-							 uni.navigateBack();
-						}
-						else if (that.cartId) {
+						if (that.navgback) {
+							uni.navigateBack();
+						} else if (that.cartId) {
 							let cartId = that.cartId;
 							let pinkId = that.pinkId;
 							let couponId = that.couponId;
@@ -437,12 +457,26 @@
 										res.data.id) + '&pinkId=' + pinkId + '&couponId=' +
 									couponId +
 									'&noCoupon=' + that
-									.noCoupon + '&delivery_type=' + that.deliveryType + '&store_id=' + that.storeId + '&store_name=' + that.store_name + '&product_id=' + that
-									.product_id
+									.noCoupon + '&delivery_type=' + that.deliveryType +
+									'&store_id=' + that.storeId + '&store_name=' + that
+									.store_name + '&product_id=' + that
+									.product_id +
+									'&huiyuanka=' +
+									that.huiyuanka +
+									'&huiyuankajiage=' +
+									that.huiyuankajiage +
+									'&huiyuanzhekou=' +
+									that.huiyuanzhekou +
+									'&vipmoney=' +
+									that.vipmoney +
+									'&vipprice=' +
+									that.vipprice+
+						'&member_type=' +
+						 that.member_type
 							});
-						} else if(that.fromType){
-						  uni.$emit('activeAddress');
-						  uni.navigateBack();
+						} else if (that.fromType) {
+							uni.$emit('activeAddress');
+							uni.navigateBack();
 						} else {
 							uni.navigateTo({
 								url: '/pages/users/user_address_list/index'
@@ -600,7 +634,7 @@
 
 		&.on {
 			border-color: var(--view-theme);
-			background-color:#fff;
+			background-color: #fff;
 
 			.inner {
 				transform: translateX(33rpx);
diff --git a/pages/users/user_address_list/index.vue b/pages/users/user_address_list/index.vue
index 9013577..2209702 100644
--- a/pages/users/user_address_list/index.vue
+++ b/pages/users/user_address_list/index.vue
@@ -117,6 +117,7 @@
 			this.huiyuanzhekou=options.huiyuanzhekou
 			this.vipmoney=options.vipmoney
 			this.vipprice=options.vipprice
+			this.member_type=options.member_type
 			this.cartId = options.cartId || '';
 			this.noCoupon = options.noCoupon || 0;
 			this.pinkId = options.pinkId || 0;
@@ -328,7 +329,9 @@
 						'&vipmoney=' +
 						this.vipmoney+
 						'&vipprice=' +
-						this.vipprice
+						this.vipprice+
+						'&member_type=' +
+						 this.member_type
 				})
 			},
 			/**
@@ -376,7 +379,9 @@
 						'&vipmoney=' +
 						this.vipmoney+
 						'&vipprice=' +
-						this.vipprice
+						this.vipprice+
+						'&member_type=' +
+						 this.member_type
 				})
 			},
 			goOrder: function(id) {
@@ -404,7 +409,9 @@
 						'&vipmoney=' +
 						this.vipmoney+
 						'&vipprice=' +
-						this.vipprice
+						this.vipprice+
+						'&member_type=' +
+						 this.member_type
 					})
 				}
 			}
@@ -432,7 +439,7 @@
 	}
 
 	.address-management.fff {
-		background-color: #fff;
+		// background-color: #fff;
 		height: 1300rpx
 	}
 
diff --git a/pages/users/user_cash/index.vue b/pages/users/user_cash/index.vue
index 40ebafc..35137bf 100644
--- a/pages/users/user_cash/index.vue
+++ b/pages/users/user_cash/index.vue
@@ -50,12 +50,12 @@
 							<view class="itemCon">
 								<view class='item acea-row row-between-wrapper'>
 									<view class='name'>持卡人</view>
-									<view class='input'><input placeholder='请输入持卡人姓名' placeholder-class='placeholder'
+									<view class='input'><input class="colorfff" placeholder='请输入持卡人姓名' placeholder-class='placeholder'
 											name="name" onKeypress="javascript:if(event.keyCode == 32)event.returnValue = false;"></input></view>
 								</view>
 								<view class='item acea-row row-between-wrapper'>
 									<view class='name'>卡号</view>
-									<view class='input'><input type='number' placeholder='请输入卡号' placeholder-class='placeholder'
+									<view class='input'><input class="colorfff" type='number' placeholder='请输入卡号' placeholder-class='placeholder'
 											name="cardnum"></input></view>
 								</view>
 								<view class='item acea-row row-between-wrapper'>
@@ -72,7 +72,7 @@
 								<view class='item acea-row row-between-wrapper'>
 									<view class='name'>提现</view>
 									<view class='input acea-row row-between-wrapper'>
-									    <input @input='inputNum' :value='cashVal' :maxlength="moneyMaxLeng" :placeholder='"最低提现金额：¥"+minPrice' placeholder-class='placeholder'
+									    <input class="colorfff" @input='inputNum' :value='cashVal' :maxlength="moneyMaxLeng" :placeholder='"最低提现金额：¥"+minPrice' placeholder-class='placeholder'
 											name="money" type='digit'></input>
 										<view class="all" @click="allCash">全部提现</view>
 									</view>
@@ -123,13 +123,13 @@
 							<view class="itemCon">
 								<view class='item acea-row row-between-wrapper' v-if="extract_wechat_type == 0">
 									<view class='name'>账号</view>
-									<view class='input'><input placeholder='请输入您的微信账号' placeholder-class='placeholder'
+									<view class='input'><input class="colorfff" placeholder='请输入您的微信账号' placeholder-class='placeholder'
 											name="name" onKeypress="javascript:if(event.keyCode == 32)event.returnValue = false;"></input></view>
 								</view>
 								<view class='item acea-row row-between-wrapper'>
 									<view class='name'>提现</view>
 									<view class='input acea-row row-between-wrapper'>
-										<input @input='inputNum' :value='cashVal' :maxlength="moneyMaxLeng" :placeholder='"最低提现金额：¥"+minPrice' placeholder-class='placeholder'
+										<input class="colorfff" @input='inputNum' :value='cashVal' :maxlength="moneyMaxLeng" :placeholder='"最低提现金额：¥"+minPrice' placeholder-class='placeholder'
 											name="money" type='digit'></input>
 										<view class="all" @click="allCash">全部提现</view>
 									</view>
@@ -269,7 +269,7 @@
 			uni.removeStorageSync('form_type_cart');
 			if (this.isLogin) {
 				this.navList = [];
-				this.currentIndex = 0;
+				// this.currentIndex = 0;
 				this.prevent = true;
 				this.cashVal = 0;
 				this.$nextTick(()=>{
@@ -315,6 +315,9 @@
 						that.qrcodeUrlZ = res.data.url;
 					}
 				});
+				this.currentTab=this.currentTab
+				this.currentIndex = this.currentIndex
+				console.log('that',this.currentTab);
 			},
 			/**
 			 * 删除图片
@@ -385,7 +388,7 @@
 							}
 						)
 					}
-					this.currentTab = this.navList[0].id;
+					// this.currentTab = this.navList[0].id;
 				})
 			},
 			swichNav: function(current,index) {
diff --git a/pages/users/user_info/index.vue b/pages/users/user_info/index.vue
index 2042c5e..1476c11 100644
--- a/pages/users/user_info/index.vue
+++ b/pages/users/user_info/index.vue
@@ -27,11 +27,11 @@
 					</view>
 					<view class='item acea-row row-between-wrapper'>
 						<view>手机号码</view>
-						<navigator url="/pages/users/user_phone/index" hover-class="none" class="input"
+						<navigator url="" hover-class="none" class="input"
 							v-if="!userInfo.phone">
-							点击绑定手机号<text class="iconfont icon-ic_rightarrow"></text>
+							暂无手机号<text class="iconfont icon-ic_rightarrow"></text>
 						</navigator>
-						<view @click="isCancellation = true" class="input"
+						<view @click="isCancellation = false" class="input"
 							v-else>
 							{{userInfo.phone}}<text class="iconfont icon-ic_rightarrow"></text>
 						</view>
@@ -135,7 +135,7 @@
 					</view>
 				</view>
 				<button class='modifyBnt' formType="submit">保存修改</button>
-
+				<!-- <button open-type="getPhoneNumber"  @getphonenumber="decryptPhoneNumber">获取手机号</button> -->
 			</view>
 		</form>
 		<canvas canvas-id="canvas" v-if="canvasStatus"
@@ -157,6 +157,9 @@
 </template>
 
 <script>
+	import {
+		routineBindingPhone, 
+	} from '@/api/public';
 	import {
 		getUserInfo,
 		userEdit,
@@ -223,6 +226,23 @@
 			uni.removeStorageSync('form_type_cart');
 		},
 		methods: {
+			decryptPhoneNumber(e){
+				console.log(123,e);
+				routineBindingPhone({
+						encryptedData: e.detail.encryptedData,
+						iv: e.detail.iv,
+						code: e.detail.code,
+					})
+					.then(res => {
+						console.log(999,res);
+					})
+					.catch(res => {
+						this.$util.Tips({
+							title: res
+						});
+						uni.hideLoading();
+					});
+			},
 			goarrow(){
 				uni.navigateBack()
 			},
diff --git a/pages/users/user_integral/index.vue b/pages/users/user_integral/index.vue
index d6d58f5..2bdf144 100644
--- a/pages/users/user_integral/index.vue
+++ b/pages/users/user_integral/index.vue
@@ -85,6 +85,18 @@
 				<view class="ljdh" @click="lijisub">立即兑换</view>
 			</view>
 		</uni-popup>
+		<uni-popup ref="popup1" type="center">
+			<view class="popupbox1">
+					<text style="float: right;" class="iconfont iconfont icon-ic_close fs-44 colorhui1" @click="close1"></text>
+					<image src="https://bar.jiuhaosh.cn/static/sbgx.png" mode="" class="popupboximg"></image>
+					<view class="neir">
+						积分兑换要成为会员 
+						<br />
+						才可以兑换哦~
+					</view>
+					<view class="huiyuanbtn" @click="chuiyuan">我要充会员</view>
+			</view>
+		</uni-popup>
 	</view>
 </template>
 
@@ -129,6 +141,7 @@
 				getHeight: this.$util.getWXStatusHeight(),
 				// #endif
 				userInfo: {},
+				userInfo1: {},
 				hostProduct: [],
 				isClose: false,
 				recharge_switch: 0,
@@ -175,6 +188,7 @@
 			this.getSignUserInfo()
 			this.getIntegralList();
 			this.getbili()
+			this.getUserInfo()
 		},
 		onReachBottom() {
 			this.getIntegralList();
@@ -269,7 +283,11 @@
 				});
 			},
 			openpopup(){
+				if(!this.userInfo1.pay_vip_status){
+					this.$refs.popup1.open('center')
+				}else{
 				 this.$refs.popup.open('bottom')
+				 }
 			},
 			close(){
 				 this.$refs.popup.close('bottom')
@@ -295,14 +313,21 @@
 				});
 			},
 			// #endif
+			chuiyuan(){
+				uni.navigateTo({
+					url:'/pages/annex/vip_paid/index'
+				})
+			},
+			close1(){
+				this.$refs.popup1.close('center')
+			},
 			/**
 			 * 获取用户详情
 			 */
 			getUserInfo: function() {
 				let that = this;
 				getUserInfo().then(res => {
-					that.$set(that, 'userInfo', res.data);
-					that.recharge_switch = res.data.recharge_switch;
+					that.userInfo1=res.data
 				});
 			},
 			/**
@@ -340,6 +365,41 @@
 </script>
 
 <style scoped lang="scss">
+	.popupbox1{
+		width: 600rpx;
+		height: 500rpx;
+		background: #1C1A1F;
+		box-shadow: 0rpx 5rpx 16rpx 0rpx rgba(6,3,14,0.39);
+		border-radius: 20rpx;
+		padding: 20rpx;
+		text-align: center;
+		.popupboximg{
+			width: 171rpx;
+			height: 189rpx;
+			margin: 0 auto;
+		}
+		.neir{
+			font-family: Alibaba PuHuiTi;
+			font-weight: 400;
+			font-size: 36rpx;
+			color: #FFFFFF;
+			line-height: 56rpx;
+			text-align: center;
+		}
+		.huiyuanbtn{
+			width: 400rpx;
+			height: 80rpx;
+			background: #F8BF1F;
+			border-radius: 40rpx;
+			margin: 50rpx auto;
+			font-family: Alibaba PuHuiTi;
+			font-weight: 400;
+			font-size: 30rpx;
+			text-align: center;
+			color: #080313;
+			line-height: 80rpx;
+		}
+	}
 	.jifenbox {
 		width: 702rpx;
 		height: 148rpx;
diff --git a/pages/users/user_money/index.vue b/pages/users/user_money/index.vue
index 506a802..c5f461f 100644
--- a/pages/users/user_money/index.vue
+++ b/pages/users/user_money/index.vue
@@ -25,9 +25,9 @@
 								class='recharge'>充值</navigator>
 							<!-- #endif -->
 							<!-- #ifdef MP -->
-							<view v-if="recharge_switch" @click="openSubscribe('/pages/users/user_payment/index')"
+							<view v-if="recharge_switch" @click="openSubscribe('/pages/users/user_payment/index','')"
 								class='recharge'>充值</view>
-								<view v-if="recharge_switch" @click="openSubscribe('/pages/users/user_cash/index')"
+								<view v-if="recharge_switch" @click="openSubscribe('/pages/users/user_cash/index','1')"
 									class='recharge'>提现</view>
 							<!-- #endif -->
 						</view>
@@ -109,6 +109,18 @@
 			</view> -->
 			<recommend :hostProduct="hostProduct"></recommend>
 		</view>
+		<uni-popup ref="popup1" type="center">
+			<view class="popupbox1">
+					<text style="float: right;" class="iconfont iconfont icon-ic_close fs-44 colorhui1" @click="close1"></text>
+					<image src="https://bar.jiuhaosh.cn/static/sbgx.png" mode="" class="popupboximg"></image>
+					<view class="neir">
+						提现要成为会员 
+						<br />
+						才可以提现哦~
+					</view>
+					<view class="huiyuanbtn" @click="chuiyuan">我要充会员</view>
+			</view>
+		</uni-popup>
 	</view>
 </template>
 
@@ -186,19 +198,46 @@
 			goarrow(){
 				uni.navigateBack()
 			},
-			// #ifdef MP
-			openSubscribe: function(page) {
-				uni.showLoading({
-					title: '正在加载',
+			chuiyuan(){
+				uni.navigateTo({
+					url:'/pages/annex/vip_paid/index'
 				})
-				openRechargeSubscribe().then(res => {
-					uni.hideLoading();
-					uni.navigateTo({
-						url: page,
+			},
+			close1(){
+				this.$refs.popup1.close('center')
+			},
+			// #ifdef MP
+			openSubscribe: function(page,e) {
+				if(e==''){
+					uni.showLoading({
+						title: '正在加载',
+					})
+					openRechargeSubscribe().then(res => {
+						uni.hideLoading();
+						uni.navigateTo({
+							url: page,
+						});
+					}).catch(() => {
+						uni.hideLoading();
 					});
-				}).catch(() => {
-					uni.hideLoading();
-				});
+				}else{
+					if(!this.userInfo.pay_vip_status){
+						this.$refs.popup1.open('center')
+					}else{
+						uni.showLoading({
+							title: '正在加载',
+						})
+						openRechargeSubscribe().then(res => {
+							uni.hideLoading();
+							uni.navigateTo({
+								url: page,
+							});
+						}).catch(() => {
+							uni.hideLoading();
+						});
+					}
+				}
+				
 			},
 			// #endif
 			/**
@@ -246,6 +285,41 @@
 </script>
 
 <style scoped lang="scss">
+	.popupbox1{
+		width: 600rpx;
+		height: 500rpx;
+		background: #1C1A1F;
+		box-shadow: 0rpx 5rpx 16rpx 0rpx rgba(6,3,14,0.39);
+		border-radius: 20rpx;
+		padding: 20rpx;
+		text-align: center;
+		.popupboximg{
+			width: 171rpx;
+			height: 189rpx;
+			margin: 0 auto;
+		}
+		.neir{
+			font-family: Alibaba PuHuiTi;
+			font-weight: 400;
+			font-size: 36rpx;
+			color: #FFFFFF;
+			line-height: 56rpx;
+			text-align: center;
+		}
+		.huiyuanbtn{
+			width: 400rpx;
+			height: 80rpx;
+			background: #F8BF1F;
+			border-radius: 40rpx;
+			margin: 50rpx auto;
+			font-family: Alibaba PuHuiTi;
+			font-weight: 400;
+			font-size: 30rpx;
+			text-align: center;
+			color: #080313;
+			line-height: 80rpx;
+		}
+	}
 	/deep/.recommend{
 		padding: 40rpx 20rpx 0 20rpx;
 	}
diff --git a/pages/users/user_return_list/index.vue b/pages/users/user_return_list/index.vue
index 1c9f8b8..b811404 100644
--- a/pages/users/user_return_list/index.vue
+++ b/pages/users/user_return_list/index.vue
@@ -38,21 +38,21 @@
 						</view>
 						<view class='acea-row row-between-wrapper'>
 							<view class='num'>申请数量：{{items.cart_num}}</view>
-							<baseMoney :money="items.productInfo.attrInfo?items.productInfo.attrInfo.price:items.productInfo.price" color='#333333' symbolSize="20" integerSize="32"
+							<baseMoney :money="items.productInfo.attrInfo?items.productInfo.attrInfo.price:items.productInfo.price" color='#D64D22' symbolSize="20" integerSize="32"
 								decimalSize="20" weight></baseMoney>
 						</view>
 					</view>
 				</view>
 				<view class="state acea-row row-middle">
 					<view class="stateCon line1">
-						<text class="title">{{item._status.status_name}}：</text>
+						<text class="title">{{item._status.status_name}}</text>
 						<text>{{item._status.desc}}</text>
 					</view>
 					<text class="iconfont icon-ic_rightarrow"></text>
 				</view>
 				<view class="bottom acea-row row-between-wrapper">
-					<baseMoney :money="item.refund_price" textColor='#333' preFix="需退款：" symbolSize="24" integerSize="36"
-						decimalSize="24" preFixSize='24' weight v-if="item.refund_type!=3 && item.refund_type!=6"></baseMoney>
+					<baseMoney :money="item.refund_price" textColor='#C6C4CA' preFix="需退款：" symbolSize="24" integerSize="36"
+						decimalSize="24" preFixSize='24' weight v-if="item.refund_type!=3 && item.refund_type!=6" color='#D64D22'></baseMoney>
 					<view class="flex-1 acea-row row-right row-middle">
 						<view @click.stop="refundAgain(item.id)" class="bnt flex-center" v-if="item.refund_type==3">再次申请</view>
 						<view @click.stop='cancelRefundOrder(item.order_id)' class="bnt flex-center" v-if="[0,1,2,4,5].indexOf(item.refund_type) != -1">撤销售后</view>
@@ -267,7 +267,7 @@
 
 <style lang="scss" scoped>
 	.return-list .goodWrapper {
-		background-color: #fff;
+		background-color: #1B1A1D;
 		position: relative;
 		width: 710rpx;
 		margin: 0 auto 20rpx auto;
@@ -288,12 +288,12 @@
 		.state{
 			width: 662rpx;
 			height: 72rpx;
-			background: #F5F5F5;
+			background: #28272A;
 			border-radius: 8px;
 			margin-top: 32rpx;
 			font-size: 26rpx;
 			font-weight: 400;
-			color: #999;
+			color: #C6C4CA;
 			padding: 0 20rpx;
 
 			.stateCon{
@@ -301,7 +301,7 @@
 			}
 
 			.title{
-				color: #333333;
+				color: #C6C4CA ;
 				font-size: 26rpx;
 				margin-right: 20rpx;
 			}
@@ -318,9 +318,9 @@
 			width: 144rpx;
 			height: 56rpx;
 			border-radius: 30rpx;
-			border: 1px solid #eee;
+			background: #FAAD35;
 			font-weight: 400;
-			color: #333333;
+			color: #080313;
 			font-size: 24rpx;
 
 			&.on{
@@ -335,7 +335,7 @@
 
 	.return-list .goodWrapper .orderNum {
 		font-size: 28rpx;
-		color: #333;
+		color: #C6C4CA;
 		font-weight: 400;
 	}
 
@@ -358,7 +358,7 @@
 				height: 100rpx;
 			}
 			.name{
-				color: #333333;
+				color: #C6C4CA;
 				width: 100%;
 			}
 			.num{
@@ -367,7 +367,7 @@
 			}
 			.money{
 				font-size: 24rpx;
-				color: var(--view-theme);
+				color: #D64D22;
 				margin: 0;
 			}
 		}
@@ -413,14 +413,14 @@
 	.search{
 		width: 710rpx;
 		height: 72rpx;
-		background: #FFFFFF;
+		background: #1B1A1D;
 		border-radius: 200rpx;
 		margin: 24rpx auto;
 		padding: 0 32rpx;
 
 		.iconfont{
 			font-size: 34rpx;
-			color: #999;
+			color: #7B7A7F;
 			margin-right: 18rpx;
 		}
 
@@ -430,7 +430,7 @@
 		}
 
 		.placeholder{
-			color: #CCCCCC;
+			color: #7B7A7F;
 		}
 	}
 </style>
diff --git a/pages/users/user_spread_money/index.vue b/pages/users/user_spread_money/index.vue
index ac248ed..f44312d 100644
--- a/pages/users/user_spread_money/index.vue
+++ b/pages/users/user_spread_money/index.vue
@@ -1,14 +1,18 @@
 <template>
 	<view :style="colorStyle">
+		<view class="topdaohang" @click="fanhui">
+			<uni-icons type="left" size="18" color="white"></uni-icons>
+			<text>提现记录</text>
+		</view>
 		<view class='commission-details'>
-			<view class='search acea-row row-between-wrapper' v-if="recordType != 1 && recordType != 4">
+			<!-- <view class='search acea-row row-between-wrapper' v-if="recordType != 1 && recordType != 4">
 				<view class='input'>
 					<text class="iconfont icon-ic_search"></text>
 					<input placeholder='搜索用户名称' placeholder-class='placeholder' v-model="keyword" @confirm="submitForm"
 						confirm-type='search' name="search"></input>
 				</view>
-			</view>
-			<timeSlot @changeTime="changeTime"></timeSlot>
+			</view>-->
+			<timeSlot @changeTime="changeTime"></timeSlot> 
 			<view class='sign-record'>
 				<view class="top_num" v-if="recordType != 4 && recordList.length">
 					支出：¥{{expend || 0}} &nbsp;&nbsp;&nbsp; 收入：¥{{income || 0}}
@@ -18,11 +22,11 @@
 						<view class='list'>
 							<view class='item'>
 								<!-- <view class='data'>{{item.time}}</view> -->
-								<view class='listn'>
+								<view class=''>
 									<!-- <block v-for="(child,indexn) in item.child" :key="indexn"> -->
-									<view class='itemn1 acea-row row-between-wrapper'>
+									<view class='itemn1 acea-row row-between-wrapper txbox'>
 										<view>
-											<view class='name line1'>
+											<view class='name line1 txtitle'>
 												{{item.title}}
 												<!-- <text class="status_badge success" v-if="recordType == 4 && item.status == 1">审核通过</text> -->
 												<text class="status_badge default" v-if="recordType == 4 && item.status == 0">待审核</text>
@@ -30,11 +34,11 @@
 												<!-- 提现记录： 0 待审核 1 通过 2 未通过 -->
 											 </view>
 											<view class="mark" v-if="item.extract_status == -1">原因：{{item.extract_msg}}</view>
-											<view>{{item.add_time}}</view>
+											<view class="txshijian">{{item.add_time}}</view>
 										</view>
 										<view>
-											<view class='num' :class="recordType == 4 && item.status == 0?'on':''" v-if="item.pm == 1">+{{item.number}}</view>
-											<view class='num' v-else>-{{item.number}}</view>
+											<view class='num txtitle' :class="recordType == 4 && item.status == 0?'on':''" v-if="item.pm == 1">+{{item.number}}</view>
+											<view class='num txtitle' v-else>-{{item.number}}</view>
 											<view class="fail" v-if="item.extract_status == -1">审核未通过</view>
 											<view class="wait" v-if="item.extract_status == 0">待审核</view>
 										</view>
@@ -155,6 +159,9 @@
 			}
 		},
 		methods: {
+			fanhui(){
+				uni.navigateBack()
+			},
 			submitForm() {
 				this.page = 1;
 				this.limit = 20;
@@ -234,6 +241,23 @@
 </script>
 
 <style scoped lang="scss">
+	.txbox{
+		background: #1B1A1D;
+		    padding: 30rpx 40rpx;
+			margin-bottom:20rpx;
+			.txtitle{
+				font-family: Alibaba PuHuiTi;
+				font-weight: 400;
+				font-size: 30rpx;
+				color: #C6C4CA;
+			}
+			.txshijian{
+				font-family: Alibaba PuHuiTi;
+				font-weight: 400;
+				font-size: 24rpx;
+				color: #7B7A7F;
+			}
+	}
 	.empty{
 		margin: 0 20rpx 20rpx 20rpx;
 	}
diff --git a/static/css/unocss.css b/static/css/unocss.css
index 42ab89c..0a278f3 100644
--- a/static/css/unocss.css
+++ b/static/css/unocss.css
@@ -2757,4 +2757,13 @@
 .wh100{
 	width: 100rpx;
 	height: 100rpx;
-}
\ No newline at end of file
+}
+.fonts31{
+	font-size: 31rpx;
+}
+.fonts45{
+	font-size: 45rpx;
+}
+.bghei{
+	background: #120F0E;
+}