Merge branch 'wwz_d' of https://e.coding.net/g-cphe0354/xiaochengxusaomadiancan/cashier_weapp into wwz_x

pages/index/components/todaylist.vue

@@ -15,7 +15,7 @@
 			<view class="therecontent_box_itembox">
 				<view class="therecontent_box_itembox_item flex-between" v-for="(item,index) in todayList.todayList"
 					:key="index" @click="clickproduct(item)">
-					<image :src="item.image" mode="aspectFill"></image>
+					<image :src="`${item.image}?x-oss-process=image/resize,m_lfit,w_114,h_136`" mode="aspectFill"></image>
 					<view class="therecontent_box_itembox_itemview flex-colum-start">
 						<view class="therecontent_box_itembox_itemviewone">
 							<text
@@ -53,7 +53,7 @@
 			<view class="therecontent_box_itembox">
 				<view class="therecontent_box_itembox_item flex-between" v-for="(item,index) in salesList.hotList"
 					:key="index" @click="clickproduct(item)">
-					<image :src="item.image" mode="aspectFill"></image>
+					<image :src="`${item.image}?x-oss-process=image/resize,m_lfit,w_114,h_136`" mode="aspectFill"></image>
 					<view class="therecontent_box_itembox_itemview flex-colum-start">
 						<view class="therecontent_box_itembox_itemviewone flex-start">
 							<view class="therecontent_box_itembox_itemviewoneafter">

pages/index/drinks.vue

@@ -155,12 +155,12 @@
 			uni.getStorage({
 				key: 'itemData',
 				success: function(res) {
-					console.log(res.data,'数据');
 					_this.type = res.data.value
 					_this.distiricttopCommon()
-					setTimeout(() => {
+					// setTimeout(() => {
 						_this.GetTop()
-					}, 1000)
+						// _this.init_fn()
+					// }, 1000)
 				}
 			});
 			// this.type = e.value
@@ -170,7 +170,19 @@
 			// }, 1000)
 		},
 		onShow() {
-			this.init_fn()
+			let _this = this
+			uni.getStorage({
+				key: 'itemData',
+				success: function(res) {
+					_this.type = res.data.value
+					_this.distiricttopCommon()
+					// setTimeout(() => {
+						// _this.GetTop()
+						_this.init_fn()
+					// }, 1000)
+				}
+			});
+			// this.init_fn()
 		},
 		computed: {
 			HeighT() { //手机类型的尺寸

pages/index/index.vue

@@ -93,7 +93,7 @@
 						</view>
 						<view class="fivecontent_item_box">
 							<view class="fivecontent_item_boxitem flex-between">
-								<image :src="item.image" mode=""></image>
+								<image :src="`${item.image}?x-oss-process=image/resize,m_lfit,w_192,h_192`" mode="aspectFill"></image>
 								<view class="fivecontent_item_boxitemleft flex-colum-start">
 									<view class="fivecontent_item_boxitemleftone flex-between"
 										style="display: flex;justify-content: space-between;align-items: center;">