no message

common/css/common.css

@@ -373,6 +373,9 @@ image {
 .pb-5 {
 	padding-bottom: 5rpx;
 }
+.pb-10 {
+	padding-bottom: 10rpx;
+}
 .p-b-20 {
 	padding-bottom: 20rpx;
 }

manifest.json

@@ -1,6 +1,6 @@
 {
     "name" : "学校",
-    "appid" : "__UNI__1578510",
+    "appid" : "__UNI__D6BA648",
     "description" : "",
     "versionName" : "1.0.1",
     "versionCode" : 101,
@@ -47,9 +47,13 @@
                 ]
             },
             /* ios打包配置 */
-            "ios" : {},
+            "ios" : {
+                "dSYMs" : false
+            },
             /* SDK配置 */
-            "sdkConfigs" : {}
+            "sdkConfigs" : {
+                "ad" : {}
+            }
         }
     },
     /* 快应用特有相关 */

pages-order/express-info.vue

@@ -88,7 +88,7 @@
 									{{item.goods_name}}
 								</view>
 								<view class="fs-32 fc-3 fw-600">
-									￥{{item.goods_money}}
+									￥{{(Number(item.goods_money)*Number(item.goods_num)).toFixed(2)}}
 								</view>
 							</view>
 							<!-- 				<view class="mb-2 fs-24 fc-9">

pages-order/group-info.vue

@@ -62,7 +62,7 @@
 									{{infoData.goods_name}}
 								</view>
 								<view class="fs-32 fc-3 fw-600">
-									￥{{infoData.goods_price}}
+									￥{{(Number(infoData.goods_price)*Number(infoData.goods_number)).toFixed(2)}}
 								</view>
 							</view>
 							<!-- 				<view class="mb-2 fs-24 fc-9">

pages-order/laundry-info.vue

@@ -70,7 +70,7 @@
 									{{item.goods_name}}
 								</view>
 								<view class="fs-32 fc-3 fw-600">
-									￥{{item.goods_money}}
+									￥{{(Number(item.goods_money)*Number(item.goods_num)).toFixed(2)}}
 								</view>
 							</view>
 							<view class="fs-24 fc-9">
@@ -119,7 +119,8 @@
 						<view class="fs-28 fc-3 w-480 mr-8 text-align-right">
 							{{infoData.order_sn}}
 						</view>
-						<image class="icon-fz" src="@/static/img/order/fz.png" mode="" @click="copy(infoData.order_sn)"></image>
+						<image class="icon-fz" src="@/static/img/order/fz.png" mode="" @click="copy(infoData.order_sn)">
+						</image>
 					</view>
 				</view>
 				<view class="display-flex flex-justify-space mb-26">
@@ -277,7 +278,7 @@
 							}).then((res) => {
 								if (res.code == 1) {
 									tools.success(res.msg)
-									setTimeout(() =>{
+									setTimeout(() => {
 										this.laundryOrderInfo(this.infoData.id)
 									}, 1500)
 									this.isAJAX = false;

pages-order/takeout-info.vue

@@ -87,7 +87,7 @@
 									{{item.goods_name}}
 								</view>
 								<view class="fs-32 fc-3 fw-600">
-									￥{{item.goods_price}}
+									￥{{ (Number(item.goods_number) * Number(item.goods_price)).toFixed(2) }}
 								</view>
 							</view>
 							<view class="mb-2 fs-24 fc-9">

pages-takeout/shop-mod/menu.vue

@@ -54,7 +54,7 @@
 			<view class="gg-box  flex-index-css">
 				<view class="flex-justify-space  box-border-box p-32">
 					<view class="fs-32 fw-500 fc-0">商品详情规格</view>
-					<view class="" @click="addred(4)">
+					<view class="" @click="gbPop">
 						<uni-icons type="closeempty" size="20"></uni-icons>
 					</view>
 				</view>
@@ -164,10 +164,10 @@
 					line_price: '',
 					num: 0,
 					goods_id: '',
-          is_quota: 0,
-          is_infinite: 0,
-          quota_num: 0,
-          stock: 0,
+					is_quota: 0,
+					is_infinite: 0,
+					quota_num: 0,
+					stock: 0,
 					spec_key: '',
 					goods_spec_id: '',
 					spec_name: [],
@@ -205,13 +205,13 @@
 				} else {
 					// 加
 					++this.popData.num;
-          if(this.popData.is_infinite>0 && this.popData.num >this.popData.stock){
-            tools.error('最多购买'+this.popData.quota_num+'件')
-            this.popData.num=this.popData.stock
-          }else  if(this.popData.is_quota>0 && this.popData.num >this.popData.quota_num){
-            tools.error('限购'+this.popData.quota_num+'件')
-            this.popData.num=this.popData.quota_num
-          }
+					if (this.popData.is_infinite > 0 && this.popData.num > this.popData.stock) {
+						tools.error('最多购买' + this.popData.quota_num + '件')
+						this.popData.num = this.popData.stock
+					} else if (this.popData.is_quota > 0 && this.popData.num > this.popData.quota_num) {
+						tools.error('限购' + this.popData.quota_num + '件')
+						this.popData.num = this.popData.quota_num
+					}
 
 				}
 
@@ -251,38 +251,38 @@
 				})
 			},
 			setGoodsSpecPrice() {
-        console.log(this.popData.spec_ids)
+				console.log(this.popData.spec_ids)
 				if (this.popData.spec_ids.length > 0) {
 					let spec_ids = JSON.parse(JSON.stringify(this.popData.spec_ids))
 					spec_ids.sort((a, b) => a - b);
 					let spec_key = spec_ids.join('_')
 					this.popData.spec_key = spec_key
-          console.log('this.popData.spec_list[spec_key]',this.popData.spec_list[spec_key])
+					console.log('this.popData.spec_list[spec_key]', this.popData.spec_list[spec_key])
 					if (this.popData.spec_list[spec_key] !== undefined) {
 						this.popData.price = this.popData.spec_list[spec_key].seckill_money > 0 ? this.popData.spec_list[
 							spec_key].seckill_money : this.popData.spec_list[spec_key].price
 						this.popData.line_price = this.popData.spec_list[spec_key].line_price
-            if(this.popData.goods_spec_id!==this.popData.spec_list[spec_key].goods_spec_id + ''){
-              this.popData.num =1
-            }
+						if (this.popData.goods_spec_id !== this.popData.spec_list[spec_key].goods_spec_id + '') {
+							this.popData.num = 1
+						}
 						this.popData.goods_spec_id = this.popData.spec_list[spec_key].goods_spec_id + ''
 						let cartKey = this.cartData.goods_list.findIndex(row => this.popData.goods_spec_id * 1 === row
 							.goods_spec_id * 1)
 						if (cartKey >= 0) {
 							this.popData.num = this.cartData.goods_list[cartKey].goods_number
 						}
-					}else {
-            this.popData.line_price ='0.00'
-            this.popData.price ='0.00'
-            this.popData.num =0
-            this.popData.goods_spec_id =''
-          }
-				}else {
-          this.popData.price ='0.00'
-          this.popData.line_price ='0.00'
-          this.popData.num =0
-          this.popData.goods_spec_id =''
-        }
+					} else {
+						this.popData.line_price = '0.00'
+						this.popData.price = '0.00'
+						this.popData.num = 0
+						this.popData.goods_spec_id = ''
+					}
+				} else {
+					this.popData.price = '0.00'
+					this.popData.line_price = '0.00'
+					this.popData.num = 0
+					this.popData.goods_spec_id = ''
+				}
 			},
 			setShopIngList(cartData) {
 				this.cartData = cartData
@@ -302,22 +302,22 @@
 			setGoodsNum() {
 
 				if (this.cartData.goods_list.length > 0) {
-          let goodsIds = []
-          this.categoryData.forEach(categoryItem => {
-            categoryItem.list.forEach(goodsItem => {
-              goodsItem.num =0
-              this.cartData.goods_list.forEach(item => {
-                if (item.goods_id === goodsItem.goods_id){
-                  if (goodsIds.indexOf(item.goods_id) < 0) {
-                    goodsIds.push(item.goods_id)
-                    goodsItem.num = item.goods_number * 1
-                  } else {
-                    goodsItem.num += item.goods_number * 1
-                  }
-                }
-              })
-            })
-          })
+					let goodsIds = []
+					this.categoryData.forEach(categoryItem => {
+						categoryItem.list.forEach(goodsItem => {
+							goodsItem.num = 0
+							this.cartData.goods_list.forEach(item => {
+								if (item.goods_id === goodsItem.goods_id) {
+									if (goodsIds.indexOf(item.goods_id) < 0) {
+										goodsIds.push(item.goods_id)
+										goodsItem.num = item.goods_number * 1
+									} else {
+										goodsItem.num += item.goods_number * 1
+									}
+								}
+							})
+						})
+					})
 
 				} else {
 					//购物车数据清除
@@ -395,27 +395,27 @@
 				} else if (type === 2) {
 					// 加
 
-          if(item.is_infinite>0 && item.num >=item.stock){
-            tools.error('最多购买'+item.quota_num+'件')
-            this.isAjax = false
-          }else  if(item.is_quota>0 && item.num >=item.quota_num){
-            tools.error('限购'+item.quota_num+'件')
-            this.isAjax = false
-          }else {
-            this.setSub(item, type);
-          }
+					if (item.is_infinite > 0 && item.num >= item.stock) {
+						tools.error('最多购买' + item.quota_num + '件')
+						this.isAjax = false
+					} else if (item.is_quota > 0 && item.num >= item.quota_num) {
+						tools.error('限购' + item.quota_num + '件')
+						this.isAjax = false
+					} else {
+						this.setSub(item, type);
+					}
 
 				} else if (type === 3) {
 					// 选规格
-          this.popData.is_quota=item.is_quota
-          this.popData.quota_num=item.quota_num
-          this.popData.is_infinite=item.is_infinite
-          this.popData.stock=item.stock
-          this.getShopGoodsSpec(item)
+					this.popData.is_quota = item.is_quota
+					this.popData.quota_num = item.quota_num
+					this.popData.is_infinite = item.is_infinite
+					this.popData.stock = item.stock
+					this.getShopGoodsSpec(item)
 				} else {
 					this.$refs.popupGG.close();
-          console.log('this.popData.goods_spec_id')
-          console.log(this.popData.goods_spec_id)
+					console.log('this.popData.goods_spec_id')
+					console.log(this.popData.goods_spec_id)
 					if (this.popData.goods_spec_id) {
 						let cartKey = this.cartData.goods_list.findIndex(row => this.popData.goods_spec_id === row
 							.goods_spec_id)
@@ -430,12 +430,15 @@
 								.popData
 								.goods_spec_id, this.popData.num)
 						}
-					}else {
-            console.log('无规格信息')
-          }
+					} else {
+						console.log('无规格信息')
+					}
 					this.isAjax = false
 				}
 			},
+			gbPop() {
+				this.$refs.popupGG.close();
+			},
 			setSub(item, type) {
 				let cartKey = this.cartData.goods_list.findIndex(row => row.goods_id === item.goods_id)
 				if (type === 2 && cartKey < 0) {
@@ -722,4 +725,4 @@
 	.goods-name {
 		max-width: 310rpx;
 	}
-</style>
+</style>

pages/index/index.vue

@@ -320,6 +320,7 @@
 			if (userToken) {
 				this.couponHome()
 			}
+			uni.removeStorageSync('orderInfoType')
 		},
 		onLoad() {
 			this.page = 1;

pages/order/index.vue

@@ -159,12 +159,12 @@
 			</view>
 		</scroll-view>
 		<uni-popup ref="popup" border-radius="10px 10px 10px 10px" @maskClick='maskClick'>
-			<view class="bgc-f b-rad-20" v-if="qrcodeData">
+			<view class="bgc-f p-16 box-border-box b-rad-20" v-if="qrcodeData">
 				<!-- <UniQrcode :text="qrcodeData"></UniQrcode> -->
-				<view class="text-align-center">
+				<uv-qrcode class="b-rad-20" ref="qrcode" :value="qrcodeData" :options="options2"></uv-qrcode>
+				<view class="text-align-center fs-38">
 					{{onlyCode}}
 				</view>
-				<uv-qrcode class="b-rad-20" ref="qrcode" :value="qrcodeData" :options="options2"></uv-qrcode>
 			</view>
 		</uni-popup>
 	</view>
@@ -276,10 +276,12 @@
 		},
 		onLoad() {},
 		onHide() {
+			console.log("onHide");
 			uni.removeStorageSync('orderPayType')
-			// uni.removeStorageSync('orderInfoType')
 		},
-		onUnload() {},
+		onUnload() {
+			console.log("onUnload");
+		},
 		mounted() {},
 		methods: {
 			openCode(item) {