1、修改密码手机号未拿到处理

2、首页/商品列表增加了广告弹窗
3、会员充值新增赠送菜品，
4、会员菜品增加最大添加数量限制
5、首页/我的/会员卡/菜品页面的图片设置
6、小程序余额支付，会员卡充值成功后增加 会员余额变动订阅（后端还未做处理，目前可以订阅不会推送）
7、多规格商品部分规格售罄/下架增加角标提示

pages/index/index.vue

@@ -226,11 +226,15 @@
 
 
 				</view>
-				<indexs v-if="!showindex" :usershopUserinfo='usershopUserinfo' :userInfo='userInfo'></indexs>
+				<indexs v-if="!showindex" :shopExtend="shopExtend" :usershopUserinfo='usershopUserinfo' :userInfo='userInfo'></indexs>
+				<popupad id="popupad" :forceUpdate='forceUpdate' :showPosition="'home'"></popupad>
 			</view>
+		</view>
+	</view>
 </template>
 <script>
 	import swipers from './components/swiper.vue'
+	import popupad from '@/components/popupad.vue'
 	import diamond from './components/diamond.vue'
 	import todaylist from './components/todaylist.vue'
 	import productlist from './components/productlist.vue'
@@ -247,7 +251,8 @@
 			advertisement,
 			category,
 			customSwiper,
-			indexs
+			indexs,
+			popupad
 		},
 		data() {
 			return {
@@ -291,7 +296,10 @@
 				categoryList: [],
 				subCategoryList: [], //二级菜单数据
 				// 登录后店铺信息
-				usershopUserinfo:{}
+				usershopUserinfo:{},
+				popupadList: [], //广告数据
+				forceUpdate: false,
+				shopExtend: null,
 			};
 		},
 
@@ -310,7 +318,6 @@
 		},
 		onHide() {
 			this.timersetInterval = '1'
-
 		},
 		computed: {
 			HeighT() { //手机类型的尺寸
@@ -331,6 +338,7 @@
 		},
 		async onShow() {
 			// 判断显示那个页面
+			
 			if (uni.cache.get('shopUser') && uni.cache.get('token')) {
 				this.showindex = false
 				uni.cache.set('types', 'index');
@@ -340,8 +348,15 @@
 				})
 				if (res.code == 0) {
 					this.usershopUserinfo = res.data
+					uni.cache.set('shopUserInfo',this.usershopUserinfo)
 				}
 				this.loginwxuserInfo()  //个人信息接口
+				if ( !uni.cache.get('forceUpdate') ) {
+					this.forceUpdate = !this.forceUpdate;
+				}
+				uni.cache.set('forceUpdate',false)
+				this.getShopExtend()
+				this.timersetInterval = '0'
 			} else {
 				uni.getLocation({
 					type: 'wgs84',
@@ -393,6 +408,19 @@
 			}
 		},
 		methods: {
+			
+			/**
+			 * 获取背景图
+			 */
+			async getShopExtend () {
+				let res = await this.api.getShopExtend({
+					shopId: uni.cache.get('shopUser'),
+					autokey: "index_bg" //index_bg my_bg member_bg shopInfo_bg
+				})
+				if ( res.code == 0) {
+					this.shopExtend = res.data;
+				}
+			},
 			// 个人信息
 			async loginwxuserInfo() {
 				let res = await this.api.loginwxuserInfo({
@@ -403,6 +431,7 @@
 					this.userInfo = uni.cache.get('userInfo')
 				}
 			},
+		
 			closeproductlist() {
 				this.showproductlist = false
 				// console.log('close');

pages/index/indexs.vue

@@ -1,6 +1,6 @@
 <template>
 	<view class="content">
-		<view class="contentbox">
+		<view class="contentbox" :style="'background:url('+(shopExtend?shopExtend.value:'https://czg-qr-order.oss-cn-beijing.aliyuncs.com/indexs/shuangbackground.png')+') no-repeat center center / cover' ">
 			<view class="contentboxitem flex-between">
 				<view class="contentboxitemleft flex-colum" @click="scanCodehandle(0)">
 					<image src="https://czg-qr-order.oss-cn-beijing.aliyuncs.com/indexs/Xdiancan.png" mode="aspectFill">
@@ -52,6 +52,12 @@
 					return {}
 				}
 			},
+			shopExtend: {
+				type: Object,
+				default () {
+					return {}
+				}
+			},
 		},
 		methods: {
 			scanCodehandle(i) {
@@ -62,7 +68,10 @@
 							let tableCode = this.getQueryString(decodeURIComponent(res.result), 'code')
 							uni.cache.set('tableCode', tableCode)
 							if (tableCode) {
-								uni.pro.navigateTo('order_food/order_food')
+								uni.cache.set('forceUpdate',true)
+								uni.pro.navigateTo('order_food/order_food', {
+									// shopId_id: uni.cache.get('shopUser'),
+								})
 							}
 
 						}
@@ -141,8 +150,6 @@
 			position: relative;
 			width: 100%;
 			height: 1046rpx;
-			background: url(https://czg-qr-order.oss-cn-beijing.aliyuncs.com/indexs/shuangbackground.png) no-repeat;
-			background-size: 100% 100%;
 			padding: 0 24rpx;
 
 			.contentboxitem {