Merge branch 'dev' into 'zfb'

Dev

See merge request quanshu/mp-ui-user!32

README.md

@@ -12,12 +12,18 @@ npm run dev
 
 // 微信小程序
 npm run dev:mp-weixin
+
+// 支付宝小程序
+npm run dev:mp-alipay
 ```
 
 ### 打包项目
 ```
 // 微信小程序
 npm run build:mp-weixin
+
+// 支付宝小程序
+npm run build:mp-alipay
 ```
 
 ### 构建项目（H5）

package-lock.json

@@ -3176,6 +3176,44 @@
           "integrity": "sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A==",
           "dev": true
         },
+        "ansi-styles": {
+          "version": "4.3.0",
+          "resolved": "https://registry.npmmirror.com/ansi-styles/-/ansi-styles-4.3.0.tgz",
+          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "color-convert": "^2.0.1"
+          }
+        },
+        "chalk": {
+          "version": "4.1.2",
+          "resolved": "https://registry.npmmirror.com/chalk/-/chalk-4.1.2.tgz",
+          "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "ansi-styles": "^4.1.0",
+            "supports-color": "^7.1.0"
+          }
+        },
+        "color-convert": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmmirror.com/color-convert/-/color-convert-2.0.1.tgz",
+          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "color-name": "~1.1.4"
+          }
+        },
+        "color-name": {
+          "version": "1.1.4",
+          "resolved": "https://registry.npmmirror.com/color-name/-/color-name-1.1.4.tgz",
+          "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+          "dev": true,
+          "optional": true
+        },
         "globby": {
           "version": "9.2.0",
           "resolved": "https://registry.npmmirror.com/globby/-/globby-9.2.0.tgz",
@@ -3192,6 +3230,13 @@
             "slash": "^2.0.0"
           }
         },
+        "has-flag": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmmirror.com/has-flag/-/has-flag-4.0.0.tgz",
+          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+          "dev": true,
+          "optional": true
+        },
         "hash-sum": {
           "version": "2.0.0",
           "resolved": "https://registry.npmmirror.com/hash-sum/-/hash-sum-2.0.0.tgz",
@@ -3204,6 +3249,25 @@
           "integrity": "sha512-cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg==",
           "dev": true
         },
+        "json5": {
+          "version": "2.2.1",
+          "resolved": "https://registry.npmmirror.com/json5/-/json5-2.2.1.tgz",
+          "integrity": "sha512-1hqLFMSrGHRHxav9q9gNjJ5EXznIxGVO09xQRrwplcS8qs28pZ8s8hupZAmqDwZUmVZ2Qb2jnyPOWcDH8m8dlA==",
+          "dev": true,
+          "optional": true
+        },
+        "loader-utils": {
+          "version": "2.0.2",
+          "resolved": "https://registry.npmmirror.com/loader-utils/-/loader-utils-2.0.2.tgz",
+          "integrity": "sha512-TM57VeHptv569d/GKh6TAYdzKblwDNiumOdkFnejjD0XwTH87K90w3O7AiJRqdQoXygvi1VQTJTLGhJl7WqA7A==",
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "big.js": "^5.2.2",
+            "emojis-list": "^3.0.0",
+            "json5": "^2.1.2"
+          }
+        },
         "slash": {
           "version": "2.0.0",
           "resolved": "https://registry.npmmirror.com/slash/-/slash-2.0.0.tgz",
@@ -3218,6 +3282,28 @@
           "requires": {
             "minipass": "^3.1.1"
           }
+        },
+        "supports-color": {
+          "version": "7.2.0",
+          "resolved": "https://registry.npmmirror.com/supports-color/-/supports-color-7.2.0.tgz",
+          "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "has-flag": "^4.0.0"
+          }
+        },
+        "vue-loader-v16": {
+          "version": "npm:vue-loader@16.8.3",
+          "resolved": "https://registry.npmmirror.com/vue-loader/-/vue-loader-16.8.3.tgz",
+          "integrity": "sha512-7vKN45IxsKxe5GcVCbc2qFU5aWzyiLrYJyUuMz4BQLKctCj/fmCa0w6fGiiQ2cLFetNcek1ppGJQDCup0c1hpA==",
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "chalk": "^4.1.0",
+            "hash-sum": "^2.0.0",
+            "loader-utils": "^2.0.0"
+          }
         }
       }
     },
@@ -15267,101 +15353,6 @@
         "vue-style-loader": "^4.1.0"
       }
     },
-    "vue-loader-v16": {
-      "version": "npm:vue-loader@16.8.3",
-      "resolved": "https://registry.npmmirror.com/vue-loader/-/vue-loader-16.8.3.tgz",
-      "integrity": "sha512-7vKN45IxsKxe5GcVCbc2qFU5aWzyiLrYJyUuMz4BQLKctCj/fmCa0w6fGiiQ2cLFetNcek1ppGJQDCup0c1hpA==",
-      "dev": true,
-      "optional": true,
-      "requires": {
-        "chalk": "^4.1.0",
-        "hash-sum": "^2.0.0",
-        "loader-utils": "^2.0.0"
-      },
-      "dependencies": {
-        "ansi-styles": {
-          "version": "4.3.0",
-          "resolved": "https://registry.npmmirror.com/ansi-styles/-/ansi-styles-4.3.0.tgz",
-          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "color-convert": "^2.0.1"
-          }
-        },
-        "chalk": {
-          "version": "4.1.2",
-          "resolved": "https://registry.npmmirror.com/chalk/-/chalk-4.1.2.tgz",
-          "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "ansi-styles": "^4.1.0",
-            "supports-color": "^7.1.0"
-          }
-        },
-        "color-convert": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmmirror.com/color-convert/-/color-convert-2.0.1.tgz",
-          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "color-name": "~1.1.4"
-          }
-        },
-        "color-name": {
-          "version": "1.1.4",
-          "resolved": "https://registry.npmmirror.com/color-name/-/color-name-1.1.4.tgz",
-          "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-          "dev": true,
-          "optional": true
-        },
-        "has-flag": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmmirror.com/has-flag/-/has-flag-4.0.0.tgz",
-          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-          "dev": true,
-          "optional": true
-        },
-        "hash-sum": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmmirror.com/hash-sum/-/hash-sum-2.0.0.tgz",
-          "integrity": "sha512-WdZTbAByD+pHfl/g9QSsBIIwy8IT+EsPiKDs0KNX+zSHhdDLFKdZu0BQHljvO+0QI/BasbMSUa8wYNCZTvhslg==",
-          "dev": true,
-          "optional": true
-        },
-        "json5": {
-          "version": "2.2.1",
-          "resolved": "https://registry.npmmirror.com/json5/-/json5-2.2.1.tgz",
-          "integrity": "sha512-1hqLFMSrGHRHxav9q9gNjJ5EXznIxGVO09xQRrwplcS8qs28pZ8s8hupZAmqDwZUmVZ2Qb2jnyPOWcDH8m8dlA==",
-          "dev": true,
-          "optional": true
-        },
-        "loader-utils": {
-          "version": "2.0.2",
-          "resolved": "https://registry.npmmirror.com/loader-utils/-/loader-utils-2.0.2.tgz",
-          "integrity": "sha512-TM57VeHptv569d/GKh6TAYdzKblwDNiumOdkFnejjD0XwTH87K90w3O7AiJRqdQoXygvi1VQTJTLGhJl7WqA7A==",
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "big.js": "^5.2.2",
-            "emojis-list": "^3.0.0",
-            "json5": "^2.1.2"
-          }
-        },
-        "supports-color": {
-          "version": "7.2.0",
-          "resolved": "https://registry.npmmirror.com/supports-color/-/supports-color-7.2.0.tgz",
-          "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "has-flag": "^4.0.0"
-          }
-        }
-      }
-    },
     "vue-style-loader": {
       "version": "4.1.3",
       "resolved": "https://registry.npmmirror.com/vue-style-loader/-/vue-style-loader-4.1.3.tgz",

src/components/activity-help/activity-help.vue

@@ -5,19 +5,19 @@
 			@touchmove.prevent.stop>
 			<view class="activityShow">
 				<view class="activityShow-one">
-					<image :src="avatar" mode="" class="activityShow-one-img"></image>
+					<image :src="avatar" mode="scaleToFill" class="activityShow-one-img"></image>
 				</view>
 				<view class="activityShow-two">
-					<image src="../../static/activity/beijingtwo.png" mode="" class="activityShow-two-img"></image>
+					<image src="../../static/activity/beijingtwo.png" mode="scaleToFill" class="activityShow-two-img"></image>
 					<text class="activityShow-two-text ells-one">{{ nickName }}</text>
 				</view>
 				<view class="activityShow-three">邀请您一起免费抽奖</view>
-				<image class="activityShow-four" src="../../static/activity/tupian.jpg" mode=""></image>
+				<image class="activityShow-four" src="../../static/activity/tupian.jpg" mode="scaleToFill"></image>
 				<view class="activityShow-five">一起免费抽奖</view>
 				<view class="activityShow-six">收下好意可以帮助好友完成抽奖助力</view>
 				<view class="activityShow-sixtwo">您也可以获得一个免费抽奖机会</view>
 				<view class="activityShow-seven" @click="activityHelp()">
-					<image src="../../static/activity/yuanjiao.png" mode="" class="activityShow-seven-img"></image>
+					<image src="../../static/activity/yuanjiao.png" mode="scaleToFill" class="activityShow-seven-img"></image>
 					<view class="activityShow-seven-view">收下好意</view>
 				</view>
 			</view>
@@ -27,13 +27,13 @@
 			@touchmove.prevent.stop>
 			<view class="closeShow">
 				<view class="closeShow-one">
-					<image class="closeShow-one-imgone" src="../../static/activity/beijing.png" mode=""></image>
-					<image class="closeShow-one-imgtwo" src="../../static/activity/beijingtwo.png" mode=""></image>
+					<image class="closeShow-one-imgone" src="../../static/activity/beijing.png" mode="scaleToFill"></image>
+					<image class="closeShow-one-imgtwo" src="../../static/activity/beijingtwo.png" mode="scaleToFill"></image>
 					<view class="closeShow-one-view">助力成功!</view>
 					<view class="closeShow-one-viewtwo">您已获得一个免费抽奖机会</view>
 				</view>
 				<view class="closeShow-two" @click="close();exChange()">
-					<image class="closeShow-two-img" src="../../static/activity/yuanjiao.png" mode=""></image>
+					<image class="closeShow-two-img" src="../../static/activity/yuanjiao.png" mode="scaleToFill"></image>
 					<view class="closeShow-two-view">确定</view>
 				</view>
 			</view>

src/components/pay-popup/pay-popup.vue

@@ -20,7 +20,7 @@
 					</view>
 					<view class="coupon-right flex">
 						<view class="txt coupon-right-color" v-if="$numberFormat(payInfo.discountAmt) != 0">-￥{{ $numberFormat(payInfo.discountAmt)}}</view>
-						<view class="txt" v-else-if="payInfo.listNum != undefined">{{payInfo.listNum}}张可用</view>
+						<view class="txt" v-else-if="total != 0">{{ total }}张可用</view>
 						<view class="txt" v-else>暂无可用优惠券</view>
 						<image src="../../static/public/public_right_arrow.png" mode="scaleToFill"></image>
 					</view>
@@ -72,10 +72,23 @@
 			return {
 				checked: true,
 				authShow: false,
+				total: 0,
 			};
 		},
-		
+		created(){
+			this.getTotal()
+		},
 		methods: {
+			getTotal(){
+				$http.post(`/api/v1/mp/user/ticket/order/coupon/listPage`, {}).then(
+					res => {
+						if (res.code == 0) {
+							this.total = res.total
+							console.log(res);
+						}
+					}).catch(() => {
+				})
+			},
 			changeChecked(e) {
 				this.checked = e
 			},

src/packageGoods/components/exchange-popup/exchange-popup.vue

@@ -10,7 +10,7 @@
 					<view class="goods-left-content flex">
 						<view class="goods-left-content__title ells-one">{{ detailInfo.title }}</view>
 						<view class="goods-left-content__coin flex">
-							<image class="image-coin" src="../../../static/public/goods_coin.png" mode=""></image>
+							<image class="image-coin" src="../../../static/public/goods_coin.png" mode="scaleToFill"></image>
 							<view>× {{ payInfo.exValue }}</view>
 						</view>
 					</view>
@@ -42,7 +42,7 @@
 				<view class="flex btn-left">
 					<view class="title">应付：</view>
 					<view class="flex coin">
-						<image src="../../../static/public/goods_coin.png" mode=""></image>
+						<image src="../../../static/public/goods_coin.png" mode="scaleToFill"></image>
 						<view>× {{ payInfo.exchangePrice }}</view>
 					</view>
 				</view>

src/packageGoods/coupon/index.vue

@@ -32,7 +32,7 @@
 
 		<view class="flex empty" v-if="!list.length">
 			<view class="center">
-				<image class="center-img" src="https://mp-public-1310078123.cos.ap-shanghai.myqcloud.com/v2/nodata_1.png" mode=""></image>
+				<image class="center-img" src="https://mp-public-1310078123.cos.ap-shanghai.myqcloud.com/v2/nodata_1.png" mode="scaleToFill"></image>
 				<view class="center-font">暂无优惠券</view>
 			</view>
 			<!-- <u-empty text="数据为空" mode="order" /> -->

src/packageGoods/goods/company.vue

@@ -3,7 +3,7 @@
 		<u-navbar title="商家信息" :border="true" :placeholder="true" :autoBack="true" bgColor="#fff" />
 		<view class="company">该商品由以下商家提供</view>
 		<view class="detail-description" v-for="(item,index) in merchantInfo" :key="index">
-			<image :src="item" mode=""></image>
+			<image :src="item" mode="scaleToFill"></image>
 		</view>
 	</view>
 </template>

src/packageGoods/goods/detail.vue

@@ -9,10 +9,10 @@
 			<!-- 详情 -->
 			<view class="detail-info flex">
 				<view class="detail-info-left">
-					<view class="detail-info-left__title ells-one">{{ info.title }}</view>
+					<view class="detail-info-left__title">{{ info.title }}</view>
 					<view class="detail-info-left__coin">
 						<view class="content flex">
-							<image src="../../static/public/goods_coin.png" mode=""></image>
+							<image src="../../static/public/goods_coin.png" mode="scaleToFill"></image>
 							<view class="coin"><text>×</text>{{ info.exchangePrice }}</view>
 						</view>
 						<view class="txt" v-if="info.originPrice">原盲豆：<text>{{ info.originPrice }}</text></view>
@@ -261,15 +261,18 @@
 			margin-bottom: 22rpx;
 			
 			&-left {
+				width: 100%;
 				flex: 1;
 				
 				&__title {
+					width: 100%;
 					font-size: 34rpx;
 					line-height: 34rpx;
-					height: 34rpx;
-					overflow: hidden;
 					margin-bottom: 26rpx;
 					font-weight: bold;
+					white-space: nowrap;
+					overflow: hidden;
+					text-overflow: ellipsis;
 				}
 				
 				&__coin {

src/packageGoods/goods/list.vue

@@ -5,7 +5,7 @@
 		<view class="fixed-top">
 			<!-- 搜索 -->
 			<view class="fixed-top-search flex">
-				<u--input v-model="title" @confirm="pageList()" confirmType="search" placeholder="请输入商品名称" border="none" prefixIcon="search" prefixIconStyle="font-size: 22px;color: #909399" />
+				<u-input v-model="title" @confirm="pageList()" confirmType="search" placeholder="请输入商品名称" border="none" prefixIcon="search" prefixIconStyle="font-size: 22px;color: #909399" />
 			</view>
 			<!-- 选择 -->
 			<view class="fixed-top-choice flex">
@@ -18,11 +18,11 @@
 				<view class="fixed-top-choice-item flex" :class="{ 'action': choiceIndex == 3 }" @click="changeChice(3)">
 					<text>价格</text>
 					<view class="icon flex" v-if="choiceIndex == 3">
-						<image src="../static/list_up.png" mode="" v-if="priceShow" />
-						<image src="../static/list_down.png" mode="" v-else />
+						<image src="../static/list_up.png" mode="scaleToFill" v-if="priceShow" />
+						<image src="../static/list_down.png" mode="scaleToFill" v-else />
 					</view>
 					<view class="icon flex" v-else>
-						<image src="../static/list_null.png" mode="" />
+						<image src="../static/list_null.png" mode="scaleToFill" />
 					</view>
 				</view>
 			</view>

src/packageGoods/order/detail.vue

@@ -5,7 +5,7 @@
 		<view class="status">
 			<image src="../../packageGoods/static/ordr/bg.png" mode="scaleToFill"></image>
 			<view class="status-info">
-				<image src="../../packageGoods/static/ordr/car.png" mode=""></image>
+				<image src="../../packageGoods/static/ordr/car.png" mode="scaleToFill"></image>
 				<view class="status-info-contet">
 					<view class="status-info-contet-txt" :class="{'status-info-contet-one': status.value != 2 }">{{ status.desc }}</view>
 					<view class="status-info-contet-time" v-if="status.value == 2">还剩 {{ autoConfirmTime || "--" }} 自动确认</view>

src/packageGoods/order/index.vue

@@ -21,7 +21,8 @@
 			<view class="order-list">
 				<view class="order-list-item" v-for="(item, index) in list" :key="index">
 					<view class="order-list-item__state">
-						<text class="success" v-if="!status">{{ item.status && item.status.desc }}</text>
+						<text class="success" v-if="item.status.value == -1 || item.status.value == 3">{{ item.status && item.status.desc }}</text>
+						<text v-else>{{ item.status && item.status.desc }}</text>
 					</view>
 					<view class="order-list-item__goods" @click="toDetail(item)">
 						<view class="order-list-item__goods-item" v-for="(items, indexs) in item.items" :key="indexs">
@@ -37,7 +38,7 @@
 					</view>
 					<view class="order-list-item-price flex">
 						<view class="order-list-item-price__num">共计<text>{{ item.orderNum }}</text>商品，</view>
-						<view class="order-list-item-price__total">总金额：<text>￥{{ $numberFormat(item.payAmt) }}</text></view>
+						<view class="order-list-item-price__total">总金额：<text>￥</text><text>{{ $numberFormat(item.payAmt) }}</text></view>
 					</view>
 					<view class="order-list-item-btn flex">
 						<view class="order-list-item-btn-item flex logistics" v-if="item.status.value == 2 || item.status.value == 3" @click="toLogistics(item)"><text>查看物流</text></view>
@@ -49,7 +50,7 @@
 			</view>
 			<view class="flex empty" v-if="!list.length && !loading">
 				<view class="center">
-					<image class="center-img" src="https://mp-public-1310078123.cos.ap-shanghai.myqcloud.com/v2/nodata_4.png" mode=""></image>
+					<image class="center-img" src="https://mp-public-1310078123.cos.ap-shanghai.myqcloud.com/v2/nodata_4.png" mode="scaleToFill"></image>
 					<view class="center-font">暂无相关订单...</view>
 				</view>
 				<!-- <u-empty text="还没有订单" mode="order" /> -->
@@ -266,22 +267,20 @@
 					font-size: 30rpx;
 					line-height: 30rpx;
 					margin-bottom: 22rpx;
+					color: #F9822C;
 					
 					.success {
-						color: #FF1818;
+						color: #999;
 					}
 				}
 				
 				// 商品列表
 				&__goods {
-					margin-bottom: 20rpx;
-					
 					&-item{
 						display: flex;
-						padding: 22rpx;
-						box-shadow: 0px 0px 8px 0px rgba(26, 35, 113, 0.08);
+						padding: 20rpx 20rpx;
 						border-radius: 4rpx;
-						margin-bottom: 20rpx;
+						border-bottom: 1px solid rgba(102, 102, 102, 0.12);
 						
 						image {
 							width: 220rpx;
@@ -318,6 +317,7 @@
 					
 					&-item:last-child {
 						margin-bottom: 0;
+						border: none;
 					}
 				}
 				
@@ -328,15 +328,16 @@
 					border-bottom: 1px solid #E5E5E5;
 					margin-bottom: 22rpx;
 					
-					&__num {
-						text {
-							color: #F9822C;
-						}
-					}
-					
 					&__total {
+						text:first-child {
+							font-size: 24rpx;
+							font-weight: normal;
+						}
+						
 						text {
-							color: #F24E4E;
+							font-size: 30rpx;
+							font-weight: bold;
+							color: #F9822C;
 						}
 					}
 				}

src/packageGoods/order/logistics.vue

@@ -51,11 +51,11 @@
 		
 		<!-- 物流信息 -->
 		<view class="logistics" v-if="deliverListData[listIndex][0].companyName && logistics!==''">
-			<u-steps current="0" direction="column" dot activeColor="#F9822C">
+			<!-- <u-steps current="0" direction="column" dot activeColor="#F9822C">
 				<u-steps-item :desc="item.context" :title="item.status + '  ' + item.time"
 					v-for="(item,index) in logistics">
 				</u-steps-item>
-			</u-steps>
+			</u-steps> -->
 		</view>
 		<view class="logistics" v-else-if="deliverListData[listIndex][0].companyName">
 			<view style="color: #b1b1b1;">

src/packageGoods/order/settlement.vue

@@ -27,23 +27,22 @@
 				<!-- 地址form -->
 				<view class="settlement-address-form" v-else>
 					<view class="address-add">
-						<u--form labelPosition="left" ref="form" labelWidth="90">
-							<u-form-item label="收货人:" borderBottom required>
-								<u--input v-model="form.receiver" border="none" placeholder="请输入收货人"></u--input>
+						<u-form labelPosition="left" ref="form" labelWidth="90"> <u-form-item label="收货人:" borderBottom required>
+								<u-input v-model="form.receiver" border="none" placeholder="请输入收货人"></u-input>
 							</u-form-item>
 							<u-form-item label="手机号码:" borderBottom required>
-								<u--input v-model="form.mobile" border="none" placeholder="请输入手机号码"></u--input>
+								<u-input v-model="form.mobile" border="none" placeholder="请输入手机号码"></u-input>
 							</u-form-item>
 							<u-form-item label="所在地区:" borderBottom required @click="selectArea">
-								<u--input v-model="form.cityShow" border="none" disabled disabledColor="#ffffff"
+								<u-input v-model="form.cityShow" border="none" disabled disabledColor="#ffffff"
 									placeholder="请选择地区">
-								</u--input>
+								</u-input>
 								<u-icon slot="right" name="arrow-right"></u-icon>
 							</u-form-item>
 							<u-form-item label="详细地址:" :borderBottom="false" required>
-								<u--textarea v-model="form.addr" placeholder="请输入详细地址"></u--textarea>
+								<u-textarea v-model="form.addr" placeholder="请输入详细地址"></u-textarea>
 							</u-form-item>
-						</u--form>
+						</u-form>
 					</view>
 					<!-- 操作按钮 -->
 					<view class="save-btn">

src/packageOperate/activity/index.vue

@@ -13,9 +13,12 @@
 		</view>
 
 		<view class="wrap">
+			<!-- 参与人 -->
 			<view class="wrap-fakeNum">
 				<view class="fakeNum">{{info.fakeNum}}人已参与</view>
 			</view>
+			
+			<!-- 距离开奖时间 -->
 			<view v-if="info.status && JSON.parse(info.status).value == 3" class="wrap-date">
 				<view class="wrap-date-on">
 					<view class="wrap-date-on-line" style="right: 30rpx;"></view>距离开奖
@@ -30,6 +33,8 @@
 					</view>
 				</u-count-down>
 			</view>
+			
+			<!-- 距离开始时间 -->
 			<view v-if="info.status && JSON.parse(info.status).value == 2" class="wrap-date">
 				<view class="wrap-date-on">
 					<view class="wrap-date-on-line" style="right: 30rpx;"></view>距离开始
@@ -44,74 +49,83 @@
 					</view>
 				</u-count-down>
 			</view>
+			
+			<!-- 一等奖 -->
 			<view v-for="(item,index) in awardsList" :key="index">
 				<view class="wrap-fixed" v-for="(itemTwo,index) in item.prizeList" :key="index"
 					v-if="item.name == '一等奖'">
 					<view class="wrap-fixed-effectstwo">
 						<view class="effectsthree">
-							<view class="effectsthree-width">
-								<image src="../static/activity/effectsthree.png"></image>
-								<view class="effectsthree-width-name">
-									{{item.name}}
-								</view>
-							</view>
-							<view class="effectsthree-position">{{item.quantity}}个名额 </view>
-							<view class="effectsthree-positionTwo">
-								<view>
-									<image :src="itemTwo.picUrl" mode="aspectFit"></image>
+							<navigator :url="JSON.parse(itemTwo.prizeType).value == 'goods' ? `/packagePrize/goods/detail?id=${ itemTwo.refId }`:JSON.parse(itemTwo.prizeType).value == 'coin' ?`/packagePrize/goods/detail?id=424`:`/packagePrize/goods/detail?id=425`"  hover-class="none">
+								<view class="effectsthree-width">
+									<image src="../static/activity/effectsthree.png"></image>
+									<view class="effectsthree-width-name">
+										{{item.name}}
+									</view>
 								</view>
-								<view class="textone ells-one"
-									v-if="itemTwo.prizeType && JSON.parse(itemTwo.prizeType).value == 'coin'">
-									{{itemTwo.title}}x{{itemTwo.value}}
+								<view class="effectsthree-position">{{item.quantity}}个名额 </view>
+								<view class="effectsthree-positionTwo">
+									<view>
+										<image :src="itemTwo.picUrl" mode="aspectFit"></image>
+									</view>
+									<view class="textone ells-one"
+										v-if="itemTwo.prizeType && JSON.parse(itemTwo.prizeType).value == 'coin'">
+										{{itemTwo.title}}x{{itemTwo.value}}
+									</view>
+									<view class="textone ells-one" v-else> {{itemTwo.title}} </view>
+									<view class="texttwo ells-one"
+										v-if="itemTwo.prizeType && JSON.parse(itemTwo.prizeType).value != 'coin'">
+										￥{{$numberFormat(itemTwo.value)}} </view>
 								</view>
-								<view class="textone ells-one" v-else> {{itemTwo.title}} </view>
-								<view class="texttwo ells-one"
-									v-if="itemTwo.prizeType && JSON.parse(itemTwo.prizeType).value != 'coin'">
-									￥{{$numberFormat(itemTwo.value)}} </view>
-							</view>
+							</navigator>
 						</view>
 						<view class="effectstwo"></view>
 					</view>
 				</view>
 			</view>
-			<view>
-				<view v-for="(item,index) in awardsList" :key="index">
+			
+			<!-- 非一等奖 -->
+			<view v-for="(item,index) in awardsList" :key="index">
 					<view v-if="item.name != '一等奖'">
 						<view class="wrap-award">
 							<view class="effectsthree">
 								<view class="effectsthree-width">
-									<image src="../static/activity/effectsthree.png" mode=""></image>
+									<image src="../static/activity/effectsthree.png" mode="scaleToFill"></image>
 									<view class="effectsthree-width-name">
 										{{item.name}}
 									</view>
 								</view>
 								<view class="effectsthree-position">{{item.quantity}}个名额 </view>
 								<view style="padding-top: 120rpx;"></view>
-								<view class="effectsthree-positionTwo flex" v-for="(itemTwo,index) in item.prizeList"
+								<view class="effectsthree-positionTwo" v-for="(itemTwo,index) in item.prizeList" 
 									:key="index">
-									<view>
-										<image :src="itemTwo.picUrl" mode="aspectFit" class="imatwo"></image>
-									</view>
-									<view>
-										<view class="textone ells-one"
-											v-if="itemTwo.prizeType && JSON.parse(itemTwo.prizeType).value == 'coin'">
-											{{itemTwo.title}}x{{itemTwo.value}}
+									<navigator :url="JSON.parse(itemTwo.prizeType).value == 'goods' ? `/packagePrize/goods/detail?id=${ itemTwo.refId }`:JSON.parse(itemTwo.prizeType).value == 'coin' ?`/packagePrize/goods/detail?id=424`:`/packagePrize/goods/detail?id=425`" hover-class="none">
+										<view class="flex" >
+											<view >
+												<image :src="itemTwo.picUrl" mode="aspectFit" class="imatwo"></image>
+											</view>
+											<view>
+												<view class="textone ells-one"
+													v-if="itemTwo.prizeType && JSON.parse(itemTwo.prizeType).value == 'coin'">
+													{{itemTwo.title}}x{{itemTwo.value}}
+												</view>
+												<view class="textone ells-one" v-else> {{itemTwo.title}}</view>
+												<view class="texttwo ells-one"
+													v-if="itemTwo.prizeType && JSON.parse(itemTwo.prizeType).value != 'coin'">
+													￥{{$numberFormat(itemTwo.value)}} </view>
+											</view>
 										</view>
-										<view class="textone ells-one" v-else> {{itemTwo.title}}</view>
-										<view class="texttwo ells-one"
-											v-if="itemTwo.prizeType && JSON.parse(itemTwo.prizeType).value != 'coin'">
-											￥{{$numberFormat(itemTwo.value)}} </view>
-									</view>
-
+									</navigator>
 								</view>
 							</view>
 							<view v-if="item.prizeList.length > 1 " class="wrap-award-explain">以上奖品随机获得一件</view>
 						</view>
 					</view>
 				</view>
-			</view>
 
 			<!-- 我的抽奖码 -->
+			
+			<!-- 抽奖码 -->
 			<view class="wrap-description">
 				<view class="wrap-description-code"> 我的抽奖码</view>
 				<view v-if="info.codeList.length > 0" class="wrap-description-codetwo">
@@ -121,7 +135,7 @@
 				</view>
 				<view v-else class="wrap-description-codethree">
 					<view class="codethree">
-						<image src="../static/activity/off.png" mode="" class="codeimg"></image>
+						<image src="../static/activity/off.png" mode="scaleToFill" class="codeimg"></image>
 					</view>
 					<text class="codesix">还没有抽奖码</text>
 				</view>
@@ -131,6 +145,7 @@
 			</view>
 
 			<!-- 关注公众号 -->
+			<!-- #ifdef MP-WEIXIN -->
 			<view class="wrap-account" @click="toWeixin">
 				<view class="wrap-account-view">
 					<image src="../static/activity/logo.png" mode=""></image>
@@ -138,7 +153,8 @@
 					<view>去关注</view>
 				</view>
 			</view>
-
+			<!-- #endif -->
+			
 			<!-- 图文介绍 -->
 			<view v-if="description" class="wrap-descriptiontwo">
 				<view style="padding: 36rpx 24rpx 36rpx;">图文介绍</view>
@@ -146,7 +162,8 @@
 			</view>
 
 		</view>
-
+		
+		<!-- #ifdef MP-WEIXIN -->
 		<view class="footer-fixed">
 			<view class="flex btn">
 				<button v-if="info.codeType == 2 && info.codeList.length < 1" type="default" @click="exChange"
@@ -154,7 +171,7 @@
 				<button v-if="info.codeType == 1 && info.codeList.length < 1" type="default" @click="exChangeCode">立即参与抽奖</button>
 				<button v-if="info.codeType == 1 && info.codeList.length >= 1 || info.codeType == 2 && info.codeList.length >= 1" type="default" @click="exChange"
 					open-type="share">分享给好友，提升中奖概率</button>
-<!-- 				<u-count-down v-else :time="activityTimeTwo" format="DD:HH:mm:ss" autoStart millisecond
+				<!--<u-count-down v-else :time="activityTimeTwo" format="DD:HH:mm:ss" autoStart millisecond
 					@change="onChange">
 					<button class="buttoncol" type="default">
 						开始倒计时：{{timeData.days}}&nbsp;天{{ timeData.hours>=10?timeData.hours:'0'+timeData.hours}}&nbsp;:{{timeData.minutes>=10?timeData.minutes:'0'+timeData.minutes}}&nbsp;:{{timeData.seconds>=10?timeData.seconds:'0'+timeData.seconds}}
@@ -162,8 +179,16 @@
 				</u-count-down> -->
 			</view>
 		</view>
-
-		<!-- 		<u-popup :show="popupShow" mode="bottom" @close="close" closeable>
+		<!-- #endif -->
+		<!-- #ifdef H5 -->
+		<view class="footer-fixed" v-if="info.codeType == 1 && info.codeList.length < 1">
+			<view class="flex btn">
+				<button type="default" @click="exChangeCode">立即参与抽奖</button>
+			</view>
+		</view>
+		<!-- #endif -->
+		
+	<!-- <u-popup :show="popupShow" mode="bottom" @close="close" closeable>
 			<view class="popupcode">获取抽奖码</view>
 			<view class="popupcodetwo">
 				<view class="popupcodetwo-view">邀请好友助力，获取抽奖码</view>

src/packageOperate/activity/record.vue

@@ -14,31 +14,31 @@
 			<view v-for="(item,index) in list" :key="index" class="list-view">
 				<view class="award flex">
 					<view class="award-avatar">
-						<image :src="item.avatar" mode=""></image>
+						<image :src="item.avatar" mode="scaleToFill"></image>
 					</view>
 
 					<view class="award-nickNames">
 						<view class="nickName"><text>{{item.nickName}}</text>
 							<view v-if="item.awardName == '一等奖'" class="awardName">
-								<image src="../static/activity/one.png" mode="">
+								<image src="../static/activity/one.png" mode="scaleToFill">
 								</image>
 								<text style="color: #FFD225;">{{item.awardName}}</text>
 							</view>
 							<view v-else-if="item.awardName == '二等奖'" class="awardName">
-								<image src="../static/activity/two.png" mode="">
+								<image src="../static/activity/two.png" mode="scaleToFill">
 								</image>
 								<text style="color: #94CBEC;">{{item.awardName}}</text>
 							</view>
 							<view v-else-if="item.awardName == '三等奖'" class="awardName">
-								<image src="../static/activity/three.png" mode=""></image>
+								<image src="../static/activity/three.png" mode="scaleToFill"></image>
 								<text style="color: #F2B47A;">{{item.awardName}}</text>
 							</view>
 							<view v-else-if="item.awardName == '四等奖'" class="awardName">
-								<image src="../static/activity/five.jpg" mode=""></image>
+								<image src="../static/activity/five.jpg" mode="scaleToFill"></image>
 								<text style="color: #f07695;">{{item.awardName}}</text>
 							</view>
 							<view v-else-if="item.awardName == '五等奖'" class="awardName">
-								<image src="../static/activity/four.jpg" mode=""></image>
+								<image src="../static/activity/four.jpg" mode="scaleToFill"></image>
 								<text style="color: #c595e7;">{{item.awardName}}</text>
 							</view>
 						</view>

src/packageOperate/address/create.vue

@@ -4,23 +4,23 @@
 			bgColor="#fff" />
 		<!-- 表单组件 -->
 		<view class="address-add">
-			<u--form labelPosition="left" ref="form" labelWidth="90">
+			<u-form labelPosition="left" ref="form" labelWidth="90">
 				<u-form-item label="收货人:" borderBottom required>
-					<u--input v-model="form.receiver" border="none" placeholder="请输入收货人"></u--input>
+					<u-input v-model="form.receiver" border="none" placeholder="请输入收货人"></u-input>
 				</u-form-item>
 				<u-form-item label="手机号码:" borderBottom required>
-					<u--input v-model="form.mobile" type="number" border="none" placeholder="请输入手机号码"></u--input>
+					<u-input v-model="form.mobile" type="number" border="none" placeholder="请输入手机号码"></u-input>
 				</u-form-item>
 				<u-form-item label="所在地区:" borderBottom required @click="selectArea">
-					<u--input v-model="form.cityShow" border="none" disabled disabledColor="#ffffff"
+					<u-input v-model="form.cityShow" border="none" disabled disabledColor="#ffffff"
 						placeholder="请选择地区">
-					</u--input>
+					</u-input>
 					<u-icon slot="right" name="arrow-right"></u-icon>
 				</u-form-item>
 				<u-form-item label="详细地址:" :borderBottom="false" required>
-					<u--textarea v-model="form.addr" placeholder="请输入详细地址"></u--textarea>
+					<u-textarea v-model="form.addr" placeholder="请输入详细地址"></u-textarea>
 				</u-form-item>
-			</u--form>
+			</u-form>
 		</view>
 		<!-- 操作按钮 -->
 		<view class="save-btn">

src/packageOperate/address/index.vue

@@ -34,9 +34,9 @@
 				</view>
 			</view>
 		</view>
-		<view class="flex empty" v-if="!list.length && !loading">
+		<view class="flex empty" v-if="!list.length">
 			<view class="center">
-				<image class="center-img" src="https://mp-public-1310078123.cos.ap-shanghai.myqcloud.com/v2/nodata_5.png" mode=""></image>
+				<image class="center-img" src="https://mp-public-1310078123.cos.ap-shanghai.myqcloud.com/v2/nodata_5.png" mode="scaleToFill"></image>
 				<view class="center-font">暂无收货地址</view>
 			</view>
 			<!-- <u-empty text="活动为空" mode="order" /> -->

src/packageOperate/process/index.vue

@@ -4,7 +4,7 @@
 		<view class="process">
 			<view class="flex box-wrap">
 				<view class="flex box">
-					<image :src="picUrlArr[0]" mode=""></image>
+					<image :src="picUrlArr[0]" mode="scaleToFill"></image>
 					<view class="box-title">
 						<view class="txt">{{ info.title }}</view>
 						<view class="id">序列号：{{ info.serialNo }}</view>

src/packageOperate/share/index.vue

@@ -6,7 +6,7 @@
 			<view class="flex invitation-user">
 				<image src="../../static/public/share_bg.png" mode="aspectFit"></image>
 				<view class="title">盲票</view>
-				<image class="avatar" :src="avatar" mode=""></image>
+				<image class="avatar" :src="avatar" mode="scaleToFill"></image>
 			</view>
 			<view class="invitation-name">{{ userInfo.nickName }}</view>
 			<view class="invitation-name-tip">邀请您一起来刮盲票</view>

src/packageOther/about/index.vue

@@ -3,8 +3,8 @@
 		<u-navbar :placeholder="true" bgColor="#fff" :autoBack="true" :border="true" title="关于我们"></u-navbar>
 		<view class="about">
 			<view class="flex about-logo">
-				<image src="../../static/public/logo.png" mode=""></image>
-				<view class="edition">v 2.0.4</view>
+				<image src="../../static/public/logo.png" mode="scaleToFill"></image>
+				<view class="edition">v 2.1.0</view>
 			</view>
 			<view class="about-action">
 				<u-cell-group :border="false">

src/packagePrize/bean/index.vue

@@ -22,12 +22,11 @@
 					</view>
 				</view>
 			</view>
-			<view class="flex empty" v-if="!list.length && !loading">
+			<view class="flex empty" v-if="!list.length">
 				<view class="center">
-					<image class="center-img" src="https://mp-public-1310078123.cos.ap-shanghai.myqcloud.com/v2/nodata_6.png" mode=""></image>
+					<image class="center-img" src="https://mp-public-1310078123.cos.ap-shanghai.myqcloud.com/v2/nodata_6.png" mode="scaleToFill"></image>
 					<view class="center-font">还没有记录</view>
 				</view>
-			
 			</view>
 		</view>
 	</view>

src/packagePrize/choice/index.vue

@@ -134,9 +134,8 @@
 							item.picUrl = env.filePublic + picUrlArr[0] + '?imageView2/2/w/340'
 							item.prizeType = JSON.parse(item.prizeType)
 						})
-						this.prizeList = res.data.prizeList
-						if(this.prizeList.length == 1) {
-							let item = this.prizeList[this.actionIndex]
+						if(res.data.prizeList.length == 1) {
+							let item = res.data.prizeList[this.actionIndex]
 							this.actionInfo = item
 							$http.post('/api/v1/mp/user/ticket/cashPrize', {
 								ticketId: this.ticketId,
@@ -147,9 +146,11 @@
 									this.comfirmShow = true
 								}
 							})
+							return
 						}
 						this.ticketId = res.data.ticketId
 						this.total = this.prizeList.length
+						this.prizeList = res.data.prizeList
 					} else if (res.code == 1018) {
 						this.tipShow = true
 					} else {

src/packagePrize/coupon/detail.vue

@@ -17,7 +17,7 @@
 				</view> -->
 				<view class="content flex">
 					<view class="content-left flex">
-						<image src="../static/prize_coupon.png" mode=""></image>
+						<image src="../static/prize_coupon.png" mode="scaleToFill"></image>
 						<view class="price flex">
 							<text>{{ info.discount / 100 }}</text>
 							<text>元</text>

src/packagePrize/coupon/use.vue

@@ -22,7 +22,7 @@
 				<view class="prize-coupon-list-item" v-for="(item, index) in list" :key="index">
 					<view class="content flex">
 						<view class="content-left flex">
-							<image src="../static/prize_coupon_use.png" mode=""></image>
+							<image src="../static/prize_coupon_use.png" mode="scaleToFill"></image>
 							<view class="price flex">
 								<text>{{ item.discount / 100 }}</text>
 								<text>元</text>
@@ -34,14 +34,14 @@
 							<view class="desc">使用期限：{{ $parseTime(item.validStart, '{y}.{m}.{d}') }} ~ {{ $parseTime(item.validEnd, '{y}.{m}.{d}') }}</view>
 						</view>
 					</view>
-					<image class="image-use" src="../static/coupon_use1.png" mode="" v-if="item.status.value == 1"></image>
-					<image class="image-use" src="../static/coupon_use2.png" mode="" v-else></image>
+					<image class="image-use" src="../static/coupon_use1.png" mode="scaleToFill" v-if="item.status.value == 1"></image>
+					<image class="image-use" src="../static/coupon_use2.png" mode="scaleToFill" v-else></image>
 				</view>
 			</view>
 		</view>
 		<view class="flex empty" v-if="!list.length">
 			<view class="center">
-				<image class="center-img" src="https://mp-public-1310078123.cos.ap-shanghai.myqcloud.com/v2/nodata_1.png" mode=""></image>
+				<image class="center-img" src="https://mp-public-1310078123.cos.ap-shanghai.myqcloud.com/v2/nodata_1.png" mode="scaleToFill"></image>
 				<view class="center-font">暂无优惠券</view>
 			</view>
 			<!-- <u-empty text="数据为空" mode="order" /> -->

src/packagePrize/prize/index.vue

@@ -70,7 +70,7 @@
 			</view>
 			<view class="flex empty" v-if="!list.length && !loading">
 				<view class="center">
-					<image class="center-img" src="https://mp-public-1310078123.cos.ap-shanghai.myqcloud.com/v2/nodata_3.png" mode=""></image>
+					<image class="center-img" src="https://mp-public-1310078123.cos.ap-shanghai.myqcloud.com/v2/nodata_3.png" mode="scaleToFill"></image>
 					<view class="center-font">还没有商品</view>
 				</view>
 			</view>
@@ -81,7 +81,7 @@
 				<view @click="toPrizeDetail(item)" class="prize-coupon-list-item" v-for="(item, index) in list" :key="index">
 					<view class="content flex">
 						<view class="content-left flex">
-							<image src="../static/prize_coupon.png" mode=""></image>
+							<image src="../static/prize_coupon.png" mode="scaleToFill"></image>
 							<view class="price flex">
 								<text>{{ item.discount / 100 }}</text>
 								<text>元</text>
@@ -101,7 +101,7 @@
 			</view>
 			<view class="flex empty" v-if="!list.length && !loading">
 				<view class="center">
-					<image class="center-img" src="https://mp-public-1310078123.cos.ap-shanghai.myqcloud.com/v2/nodata_1.png" mode=""></image>
+					<image class="center-img" src="https://mp-public-1310078123.cos.ap-shanghai.myqcloud.com/v2/nodata_1.png" mode="scaleToFill"></image>
 					<view class="center-font">还没有优惠券</view>
 				</view>
 			</view>

src/packagePrize/rolling/index.vue

@@ -58,8 +58,8 @@
 					<view class="prize-box-popup__image flex">
 						<image :src="prizeInfo.picUrl" mode="aspectFit"></image>
 					</view>
-					<image class="prize-box-popup__rotate" src="../static/rolling_bg1.png" mode="" v-if="rotateShow" />
-					<image class="prize-box-popup__circular" src="../static/rolling_bg2.png" mode="" v-if="circularShow" />
+					<image class="prize-box-popup__rotate" src="../static/rolling_bg1.png" mode="scaleToFill" v-if="rotateShow" />
+					<image class="prize-box-popup__circular" src="../static/rolling_bg2.png" mode="scaleToFill" v-if="circularShow" />
 				</view>
 			</view>
 			<view class="prize-info flex">
@@ -389,11 +389,11 @@
 		// 奖品滚动
 		&-prize {
 			display: flex;
-			margin-top: 30vh;
+			margin-top: 28vh;
 			height: 28vh;
 			background: url(https://mp-public-1310078123.cos.ap-shanghai.myqcloud.com/v2/prize_bkg2.png) center center no-repeat;
 			background-size: 100vw 28vh;
-			margin-bottom: 42rpx;
+			margin-bottom: 82rpx;
 			
 			&-list {
 				display: flex;

src/packagePrize/ticket/index.vue

@@ -37,7 +37,7 @@
 		</view>
 		<view class="flex empty" v-if="!list.length">
 			<view class="center">
-				<image class="center-img" src="https://mp-public-1310078123.cos.ap-shanghai.myqcloud.com/v2/nodata_3.png" mode=""></image>
+				<image class="center-img" src="https://mp-public-1310078123.cos.ap-shanghai.myqcloud.com/v2/nodata_3.png" mode="scaleToFill"></image>
 				<view class="center-font">暂无盲票</view>
 			</view>
 			<!-- <u-empty text="数据为空" mode="order" /> -->

src/pages.json

@@ -188,9 +188,11 @@
 	},
 	"globalStyle": {
 		"navigationBarTextStyle": "black",
-		"navigationBarTitleText": "盲票",
+		"navigationBarTitleText": "",
 		"navigationBarBackgroundColor": "#ffffff",
 		"backgroundColor": "#F8F8F8",
-		"navigationStyle": "custom"
+		"navigationStyle": "custom",
+		"allowsBounceVertical": "NO",
+		"transparentTitle": "always"
 	}
 }

src/pages/activity/index.vue

@@ -22,12 +22,12 @@
 				<view class="list-view-slot">
 					<view @click="toRecord(item)">
 						<view style="position: relative;">
-							<image :src="item.picUrl" mode="" class="list-view-slot-img"></image>
+							<image :src="item.picUrl" mode="scaleToFill" class="list-view-slot-img"></image>
 							<span v-if="item.status.value == 3" style="position: absolute; right: 30rpx; top: 300rpx; border-radius: 6rpx; font-size: 24rpx; padding: 10rpx; color: #333333; background-color: rgba(255, 255, 255, 0.5);">{{item.fakeNum}}人已参与</span>
 						</view>
-						<view class="list-view-slot-bor">
+						<view class="list-view-slot-bor flex">
 							<view class="list-view-slot-bor-title">
-								<view class="time bor-title">{{item.title}}</view>
+								<view class="time bor-title ells-one">{{item.title}}</view>
 								<!-- <view v-if="item.status.value == 2" class="time">
 									开始时间：{{ $parseTime(item.startTime, '{y}-{m}-{d} {h}:{i}:{s}')}}</view> -->
 								<!-- <view v-else class="time">开奖时间：{{ $parseTime(item.endTime, '{y}-{m}-{d} {h}:{i}:{s}')}} -->
@@ -49,18 +49,16 @@
 			<view class="flex empty" v-if="!list.length && !loading && triggerStatus == 0">
 				<view class="center">
 					<image class="center-img"
-						src="https://mp-public-1310078123.cos.ap-shanghai.myqcloud.com/v2/nodata_3.png" mode=""></image>
+						src="https://mp-public-1310078123.cos.ap-shanghai.myqcloud.com/v2/nodata_3.png" mode="scaleToFill"></image>
 					<view class="center-font">新的活动正在准备中...</view>
 				</view>
-				<!-- <u-empty text="活动为空" mode="order" /> -->
 			</view>
 			<view class="flex empty" v-if="!list.length && !loading && triggerStatus != 0">
 				<view class="center">
 					<image class="center-img"
-						src="https://mp-public-1310078123.cos.ap-shanghai.myqcloud.com/v2/nodata_3.png" mode=""></image>
+						src="https://mp-public-1310078123.cos.ap-shanghai.myqcloud.com/v2/nodata_3.png" mode="scaleToFill"></image>
 					<view class="center-font">还没有已开奖活动</view>
 				</view>
-				<!-- <u-empty text="活动为空" mode="order" /> -->
 			</view>
 		</view>
 		<custom-tab-bar :activeValue="'activity'" />
@@ -187,6 +185,7 @@
 				}
 
 				&-bor {
+					justify-content: space-between;
 					line-height: 50rpx;
 					width: 700rpx;
 					height: 140rpx;
@@ -204,9 +203,11 @@
 
 						.bor-title {
 							font-size: 32rpx;
+							// width: 70%;
 						}
 
 						.timetwo {
+							width: 420rpx;
 							background: rgba(249, 130, 44, 0.08);
 							margin-top: 10rpx;
 							border: 2rpx solid #F9822C;

src/pages/core/index.vue

@@ -4,7 +4,7 @@
 		<u-navbar leftIconSize="0" :placeholder="true" bgColor="#ffffff">
 			<view class="u-nav-slot" slot="left">
 				<view class="u-nav-slot__input flex">
-					<u--input v-model="goodsTitle" @confirm="toGoodsList()" confirmType="search" placeholder="搜索商品" border="none" prefixIcon="search" prefixIconStyle="font-size: 22px;color: #909399" />
+					<u-input v-model="goodsTitle" @confirm="toGoodsList()" confirmType="search" placeholder="搜索商品" border="none" prefixIcon="search" prefixIconStyle="font-size: 22px;color: #909399" />
 					<!-- <view class="u-nav-slot__input__btn" @click="toGoodsList()">搜索</view> -->
 				</view>
 			</view>
@@ -32,11 +32,11 @@
 					<view class="fixed-top-screen-content__item flex" @click="changeScreen(1)">
 						<view class="title">价格</view>
 						<view class="select flex" v-if="screenIndex == 1">
-							<image src="../../static/core/core_up.png" mode="" v-if="priceShow" />
-							<image src="../../static/core/core_down.png" mode="" v-else />
+							<image src="../../static/core/core_up.png" mode="scaleToFill" v-if="priceShow" />
+							<image src="../../static/core/core_down.png" mode="scaleToFill" v-else />
 						</view>
 						<view class="select flex" v-else>
-							<image src="../../static/core/core_null.png" mode="" />
+							<image src="../../static/core/core_null.png" mode="scaleToFill" />
 						</view>
 					</view>
 					<view class="fixed-top-screen-content__item flex" @click="changeScreen(2)">
@@ -67,7 +67,7 @@
 		<view class="core-swiper" v-if="swiperList.length">
 			<swiper class="core-swiper-centent" circular :indicator-dots="true" :autoplay="true" :interval="3000" indicator-active-color="#fff">
 				<swiper-item class="swiper-item" v-for="(item, index) in swiperList" :key="index" @click="toPage(item)">
-					<image :src="item.picUrl" mode=""></image>
+					<image :src="item.picUrl" mode="scaleToFill"></image>
 				</swiper-item>
 			</swiper>
 		</view>
@@ -86,17 +86,17 @@
 		
 		<!-- 标签商品 -->
 		<view class="tag-goods" v-for="(item, index) in exclusiveSingle" :key="index">
-			<image class="tag-goods-imgBg" src="../../static/core/core_bg.png" mode=""></image>
+			<image class="tag-goods-imgBg" src="../../static/core/core_bg.png" mode="scaleToFill"></image>
 			<view class="tag-goods-content">
 				<view class="tag-goods-content-nav flex">
 					<view class="tag-goods-content-nav__left flex">
-						<image src="../../static/core/core_tag.png" mode=""></image>
+						<image src="../../static/core/core_tag.png" mode="scaleToFill"></image>
 						<view class="title">{{ item.name }}</view>
-						<image src="../../static/core/core_tag.png" mode=""></image>
+						<image src="../../static/core/core_tag.png" mode="scaleToFill"></image>
 					</view>
 					<view class="tag-goods-content-nav__right flex" @click="toTagGoods(item)">
 						<view class="title">更多</view>
-						<image src="../../static/core/core_right.png" mode=""></image>
+						<image src="../../static/core/core_right.png" mode="scaleToFill"></image>
 					</view>
 				</view>
 				
@@ -122,7 +122,7 @@
 						<view class="content-title ells-one">{{ item.title }}</view>
 						<view class="content-coin flex">
 							<view class="content-coin__left flex">
-								<image src="../../static/public/goods_coin.png" mode=""></image>
+								<image src="../../static/public/goods_coin.png" mode="scaleToFill"></image>
 								<view class="num"><text>×</text>{{ item.exchangePrice }}</view>
 							</view>
 							<view class="content-coin__right" v-if="item.originPrice">{{ item.originPrice }}</view>
@@ -134,7 +134,7 @@
 			</view>
 			<view class="flex empty" v-if="!list.length">
 				<view class="center">
-					<image class="center-img" src="https://mp-public-1310078123.cos.ap-shanghai.myqcloud.com/v2/nodata_3.png" mode=""></image>
+					<image class="center-img" src="https://mp-public-1310078123.cos.ap-shanghai.myqcloud.com/v2/nodata_3.png" mode="scaleToFill"></image>
 					<view class="center-font">还没有商品</view>
 				</view>
 			</view>

src/pages/index/index.vue

@@ -4,13 +4,13 @@
 			<view class="index" :style="{ top: statusHeight + 'px' }">
 				<view class="barrage">
 					<!-- 背景 -->
-					<image class="barrage-bg" src="../../static/index/barrage_bg.png" mode=""></image>
+					<image class="barrage-bg" src="../../static/index/barrage_bg.png" mode="scaleToFill"></image>
 					<!-- 中奖信息轮播 -->
 					<swiper class="barrage-swiper" :interval="2000" :autoplay="true" :vertical="true" :circular="true">
 						<swiper-item v-for="(item, index) in prizeNewsListOne" :key="index">
 							<view class="barrage-swiper-item flex">
 								<view class="barrage-swiper-item-content flex">
-									<image :src="item.avatar" mode="" />
+									<image :src="item.avatar" mode="scaleToFill" />
 									<view class="title ells-one">{{ item.nickName }} {{ item.type == 1 ? '刮出了' : '兑换了' }} {{ item.prizeInfo }}</view>
 								</view>
 							</view>
@@ -22,7 +22,7 @@
 				<!-- 查看规则 -->
 				<view class="rule">
 					<view class="rule-content flex" @click="toRule">
-						<image src="../../static/index/index_tip.png" mode=""></image>
+						<image src="../../static/index/index_tip.png" mode="scaleToFill"></image>
 						<text>查看规则</text>
 					</view>
 				</view>
@@ -52,7 +52,7 @@
 						<u-line-progress :percentage="percentage" height="3" :showText="false" inactiveColor="rgba(255, 255, 255, .36)" activeColor="#fff" />
 					</view>
 					<view class="proposal-tip" @click="contactService">
-						<image src="../../static/index/index_tip_bg.png" mode=""></image>
+						<image src="../../static/index/index_tip_bg.png" mode="scaleToFill"></image>
 						<text>投诉建议</text>
 					</view>
 				</view>
@@ -102,9 +102,6 @@
 				
 				<!-- 盲票价格 -->
 				<view class="ticket-price flex">
-					<!-- <view class="ticket-price-checkbox flex">
-						<image src="../../static/index/index_price_checkout.png" mode="scaleToFill"></image>
-					</view> -->
 					<view class="ticket-price-amt flex">
 						<view class="num">{{ $numberFormat(ticketInfo.salePrice) }}</view>
 						<view class="txt">元</view>
@@ -184,6 +181,14 @@
 			this.statusHeight = res.top //胶囊距离顶部
 			// #endif
 			
+			// #ifdef MP-ALIPAY
+			uni.getSystemInfo({
+				success: (res) => {
+					this.statusHeight = res.statusBarHeight + 7
+				}
+			})
+			// #endif
+			
 			let num = Math.round(100 / this.list.length)
 			this.percentage = num
 

src/pages/login/code.vue

@@ -5,7 +5,7 @@
 			<view class="login">
 				<view class="login-title">验证码登录</view>
 				<view class="login-input pat">
-					<u--input placeholder="请输入手机号" type="number" v-model="mobile" border="none" clearable></u--input>
+					<u-input placeholder="请输入手机号" type="number" v-model="mobile" border="none" clearable/>
 				</view>
 				<view class="login-input">
 					<u-input placeholder="请输入短信验证码" type="number" v-model="code" clearable>

src/pages/login/index.vue

@@ -1,9 +1,16 @@
 <template>
 	<view class="container">
-		<u-navbar :placeholder="true" bgColor="#fff" :autoBack="true" title="登录"></u-navbar>
+		<!-- #ifdef MP-ALIPAY -->
+		<u-navbar :placeholder="true" bgColor="#fff" :autoBack="true" title="登录" leftIconSize="0"></u-navbar>		
+		<!-- #endif -->
+		
+		<!-- #ifndef MP-ALIPAY -->
+		<u-navbar :placeholder="true" bgColor="#fff" :autoBack="true" title="登录"></u-navbar>		
+		<!-- #endif -->
+
 		<view class="flex login">
 			<view class="flex login-image">
-				<image src="../../static/public/logo.png" mode=""></image>
+				<image src="../../static/public/logo.png" mode="scaleToFill"></image>
 				<view class="login-image-txt">盲票</view>
 			</view>
 			<view class="login-btn">

src/pages/lucky/index.vue

@@ -5,21 +5,26 @@
 			<view class="flex luck-warp" @touchmove.prevent.stop>
 				<view class="luck-info">
 					<view class="luck-info-bg">
-						<image src="../../static/lucky/lucky_bg.png" mode=""></image>
+						<image src="../../static/lucky/lucky_bg.png" mode="scaleToFill"></image>
 					</view>
 					<view class="luck-info-content flex">
 						<view class="luck-info-content-num">
-							<image src="../../static/lucky/lucky_not_num.png" mode="" v-if="info.status == 1"></image>
-							<image src="../../static/lucky/lucky_ok_num.png" mode="" v-else></image>
-							<view class="luck-info-content-num__content flex" v-if="info.status == 2">
-								<text>{{ info.plainLuckyNum }}</text>
-							</view>
+							<image src="../../static/lucky/lucky_gkmp.png" mode="scaleToFill"></image>
+						</view>
+						<view class="luck-info-content-img">
+							<view class="luck-info-content-img-word">
+								<image class="img" src="../../static/lucky/lucky_tu.png" mode="scaleToFill"></image>
+								<view class="luck-info-content-img-word__content">
+									<text>{{ info.awardsName }}</text>
+								</view>
+								<image class="imgtwo" src="../../static/lucky/lucky_xiaoguo.png" mode="scaleToFill" v-if="infoimg">
+								</image>
+								<image class="img" src="../../static/lucky/lucky_guajiangqu.png" mode="scaleToFill" v-if="info.status == 1">
+								<image class="imgone" src="../../static/lucky/lucky_yidong.png" v-else-if="info.status == 2"></image>
+							</view> 
 						</view>
-						<view class="luck-info-content-title" v-if="info.status == 1">- 幸运数字 -</view>
-						<view class="luck-info-content-tip" v-else>请刮开纸质票面的数字，与此幸运数字相同的就是所中奖项</view>
 						<view class="luck-info-content-ticket">
-							<image src="../../static/lucky/lucky_not.png" mode="" v-if="info.status == 1"></image>
-							<image src="../../static/lucky/lucky_ok.png" mode="" v-else></image>
+							<image src="../../static/lucky/lucky_piaohao.png" mode="scaleToFill"></image>
 							<view class="luck-info-content-ticket-info flex">
 								<view class="title" :class="{ 'action': info.status == 2 }">{{ info.title }}</view>
 								<view class="serialNo" :class="{ 'action': info.status == 2 }">盲票序列号：{{ info.serialNo }}
@@ -27,10 +32,10 @@
 							</view>
 						</view>
 						<view class="luck-info-content-btn" @click="pay" v-if="info.status == 1 && info.salePrice != 0">
-							支付{{ info.salePrice / 100 }}元 立即查看</view>
+							支付{{ info.salePrice / 100 }}元 立即刮开盲票</view>
 						<view class="luck-info-content-btn" @click="payDetail"
-							v-else-if="info.status == 1 && info.salePrice == 0">收下盲票，查看幸运数字</view>
-						<view class="luck-info-content-btn code" @click="scanCode" v-else>扫码兑奖</view>
+							v-else-if="info.status == 1 && info.salePrice == 0">收下盲票，立即刮开盲票</view>
+						<view class=" code" v-else>开奖啦!</view>
 					</view>
 					<view class="luck-info-close flex">
 						<navigator open-type="exit" target="miniProgram" hover-class="none"
@@ -45,10 +50,17 @@
 		<pay-popup :pay-show="payShow" :pay-info="payInfo" @close="close" @success="getDetailInfo" v-if="payShow" />
 
 		<u-popup :show="showNull" :round="10" mode="center" :safeAreaInsetBottom="false" overlayOpacity="0.8"
+			@touchmove.prevent.stop>
+			<view class="null-prize">
+				<view class="title">该盲票已兑奖</view>
+				<view class="btn" @click="toUser">确认</view>
+			</view>
+		</u-popup>
+		
+		<u-popup :show="tipShow" :round="10" mode="center" :safeAreaInsetBottom="false" overlayOpacity="0.8"
 			@touchmove.prevent.stop>
 			<view class="null-prize">
 				<view class="title">该盲票已被他人买走了</view>
-				<!-- <navigator open-type="exit" target="miniProgram" hover-class="none" class="btn">确认</navigator> -->
 				<view class="btn" @click="toUser">确认</view>
 			</view>
 		</u-popup>
@@ -85,6 +97,7 @@
 				luckyShow: false,
 				status: 2,
 				showAction: false,
+				infoimg: false,
 			};
 		},
 
@@ -98,29 +111,10 @@
 				let obj = urlParameter(decodeURIComponent(options.q))
 				this.serialNo = obj.id
 				this.getDetail()
-				// let url = JSON.stringify(options.q)
-				// this.serialNo = url.substring(url.length - 22, url.length - 1)
-				// this.getDetail()
 			}
 		},
 
 		methods: {
-			scanCode() {
-				let _this = this
-				uni.scanCode({
-					scanType: ['qrCode'],
-					success(res) {
-						let url = res.result
-						// _this.serialNo = url.substring(url.length - 21, url.length)
-						_this.serialNo = urlParameter(url).id
-						_this.getDetail()
-					},
-					fail() {
-						uni.$u.toast('请扫二维码');
-					}
-				});
-			},
-
 			getDetail() {
 				uni.showLoading({
 					title: '加载中'
@@ -140,6 +134,7 @@
 								uni.redirectTo({
 									url: `/packagePrize/choice/index?id=${ res.data.ticketId }&type=offLine`
 								})
+
 							} else {
 								this.luckyShow = true
 								uni.showModal({
@@ -190,7 +185,14 @@
 					if (res.code == 0) {
 						if (res.data.status == 2) {
 							_this.info = res.data
-							let num = res.data.plainLuckyNum
+							setTimeout(() => {
+								this.infoimg = true
+								setTimeout(() => {
+									uni.redirectTo({
+										url: `/packagePrize/choice/index?id=${ res.data.ticketId }&type=offLine`
+									})
+								}, 500)
+							}, 500)
 						} else {
 							let num = 0
 							let time = setInterval(() => {
@@ -206,7 +208,14 @@
 										uni.hideLoading();
 										clearInterval(time)
 										_this.info = res.data
-										let num = res.data.plainLuckyNum
+										setTimeout(() => {
+											this.infoimg = true
+											setTimeout(() => {
+												uni.redirectTo({
+													url: `/packagePrize/choice/index?id=${ res.data.ticketId }&type=offLine`
+												})
+											}, 500)
+										}, 500)
 									}
 								})
 								if (num == 10) {
@@ -243,8 +252,8 @@
 								uni.hideLoading();
 								if (res.code == 0) {
 									this.getDetailInfo()
-								}else {
-									this.showNull = true
+								} else {
+									this.tipShow = true
 									this.luckyShow = false
 								}
 							}).catch(() => {
@@ -309,7 +318,6 @@
 			position: relative;
 			width: 87vw;
 			height: 60vh;
-			// background-color: #fff;
 
 			&-bg {
 				position: absolute;
@@ -332,10 +340,10 @@
 
 				&-num {
 					position: relative;
-					width: 60%;
-					height: 10vh;
-					margin-top: 17vh;
-					margin-bottom: 2vh;
+					width: 422rpx;
+					height: 8vh;
+					margin-top: 16vh;
+					margin-bottom: 3vh;
 
 					image {
 						position: absolute;
@@ -344,17 +352,61 @@
 						height: 100%;
 					}
 
-					&__content {
+
+				}
+
+				&-img {
+					position: relative;
+					width: 73%;
+					height: 10vh;
+					background-color: #fff;
+					border-radius: 12rpx;
+
+					&-word {
 						position: absolute;
-						top: 0;
-						width: 100%;
-						height: 100%;
-						z-index: 5;
-						font-size: 120rpx;
-						font-family: YouSheBiaoTiHei;
-						font-weight: 400;
-						color: #FD3331;
+						top: 15%;
+						left: 5%;
+						width: 90%;
+						height: 85%;
+						overflow: hidden;
+
+						.img {
+							position: absolute;
+							width: 100%;
+							height: 82.6%;
+						}
+
+						.imgtwo {
+							position: absolute;
+							width: 20%;
+							height: 82%;
+							left: -20%;
+							animation: shadowTwoMove 0.5s linear infinite;
+							animation-iteration-count: 1;
+						}
+
+						.imgone {
+							position: absolute;
+							left: 100%;
+							width: 100%;
+							height: 100%;
+							animation: shadowMove 0.5s linear infinite;
+							animation-iteration-count: 1;
+						}
+
+						&__content {
+							position: absolute;
+							top: 25%;
+							text-align: center;
+							width: 100%;
+							height: 100%;
+							font-size: 36rpx;
+							font-family: YouSheBiaoTiHei;
+							font-weight: 400;
+							color: #fff;
+						}
 					}
+
 				}
 
 				&-title {
@@ -374,20 +426,21 @@
 
 				&-ticket {
 					position: relative;
-					width: 96%;
-					height: 14vh;
-					margin-bottom: 2vh;
+					width: 73%;
+					height: 10vh;
+					margin-top: 2vh;
 
 					image {
 						position: absolute;
 						top: 0;
 						width: 100%;
-						height: 100%;
+						height: 95%;
 					}
 
 					&-info {
-						width: 100%;
-						height: 100%;
+						width: 90%;
+						height: 75%;
+						left: 5%;
 						position: absolute;
 						top: 0;
 						z-index: 5;
@@ -395,15 +448,15 @@
 						flex-direction: column;
 
 						.title {
-							font-size: 36rpx;
-							line-height: 36rpx;
-							font-weight: bold;
+							font-size: 30rpx;
+							line-height: 30rpx;
 							color: #FF6D2C;
-							margin-bottom: 2vh;
+							margin-top: 1vh;
+							margin-bottom: 1vh;
 						}
 
 						.serialNo {
-							font-size: 26rpx;
+							font-size: 24rpx;
 							color: #FF6D2C;
 						}
 
@@ -414,19 +467,26 @@
 				}
 
 				&-btn {
-					padding: 0 13%;
-					height: 8vh;
-					line-height: 8vh;
+					padding: 0 8%;
+					height: 7vh;
+					line-height: 7vh;
 					background: linear-gradient(0deg, #FF4924, #F9D448);
 					box-shadow: 0px 6px 9px 0px rgba(135, 19, 3, 0.49);
 					border-radius: 4vh;
 					text-align: center;
 					color: #FEFEFE;
 					font-size: 40rpx;
+					margin-top: 1vh;
 				}
 
 				.code {
 					padding: 0 20%;
+					height: 7vh;
+					line-height: 10vh;
+					text-align: center;
+					color: #FEFEFE;
+					font-family: YouSheBiaoTiHei;
+					font-size: 38rpx
 				}
 			}
 
@@ -474,4 +534,26 @@
 			text-align: center;
 		}
 	}
+
+	// 支付后移动动画
+	@keyframes shadowMove {
+		0% {
+			left: 0%;
+		}
+
+		100% {
+			left: 100%;
+		}
+	}
+
+	// 支付后移动动画
+	@keyframes shadowTwoMove {
+		0% {
+			left: -20%;
+		}
+
+		100% {
+			left: 100%;
+		}
+	}
 </style>

src/pages/ticketBox/detail.vue

@@ -16,7 +16,7 @@
 			<!-- 查看规则 -->
 			<view class="prize-rule" @click="toRule">
 				<view class="prize-rule-content flex">
-					<image src="../../static/index/index_tip.png" mode=""></image>
+					<image src="../../static/index/index_tip.png" mode="scaleToFill"></image>
 					<text>查看规则</text>
 				</view>
 			</view>
@@ -50,8 +50,10 @@
 					<view class="ticket-btn-center-txt">刮开盲票</view>
 				</view>
 				<view class="ticket-btn-share flex">
+					<!-- #ifdef MP-WEIXIN -->
 					<image src="../../static/ticketBox/ticket_share.png" mode="scaleToFill" @click="toShare"></image>
 					<button type="default" open-type="share" v-if="loginState"></button>
+					<!-- #endif -->
 				</view>
 			</view>
 		</view>
@@ -155,6 +157,16 @@
 			if (opthios.type) {
 				uni.setStorageSync('shareType', opthios.type)
 			}
+			
+			/**
+			* 外部app跳转接受的参数
+			* shareUid: 用户ID
+			* shareType: 分享类型
+			* */
+			if(opthios.uid) {
+				uni.setStorageSync('shareUid', opthios.uid)
+				uni.setStorageSync('shareType', opthios.t)
+			}
 		},
 		
 		mounted() {

src/pages/user/index.vue

@@ -51,28 +51,28 @@
 			</u-cell-group> -->
 			<view class="action-item flex" @click="toOrder">
 				<view class="action-item-left flex">
-					<image src="../../static/user/user_order.png" mode=""></image>
+					<image src="../../static/user/user_order.png" mode="scaleToFill"></image>
 					<view class="title">我的订单</view>
 				</view>
 				<u-icon name="arrow-right" color="#666" size="16"></u-icon>
 			</view>
 			<view class="action-item flex" @click="toAddress">
 				<view class="action-item-left flex">
-					<image class="addr" src="../../static/user/user_addr.png" mode=""></image>
+					<image src="../../static/user/user_addr.png" mode="scaleToFill"></image>
 					<view class="title">我的地址</view>
 				</view>
 				<u-icon name="arrow-right" color="#666" size="16"></u-icon>
 			</view>
 			<view class="action-item flex" @click="contactService">
 				<view class="action-item-left flex">
-					<image src="../../static/user/user_kefu.png" mode=""></image>
+					<image src="../../static/user/user_kefu.png" mode="scaleToFill"></image>
 					<view class="title">联系客服</view>
 				</view>
 				<u-icon name="arrow-right" color="#666" size="16"></u-icon>
 			</view>
 			<view class="action-item flex" @click="toAbout">
 				<view class="action-item-left flex">
-					<image src="../../static/user/user_about.png" mode=""></image>
+					<image src="../../static/user/user_about.png" mode="scaleToFill"></image>
 					<view class="title">关于我们</view>
 				</view>
 				<u-icon name="arrow-right" color="#666" size="16"></u-icon>
@@ -82,7 +82,7 @@
 			<!-- <u-cell icon="close-circle" title="退出登录" :isLink="true" :border="false" @click="logout" /> -->
 			<view class="action-item flex" @click="logout">
 				<view class="action-item-left flex">
-					<image class="close" src="../../static/user/user_close.png" mode=""></image>
+					<image class="close" src="../../static/user/user_close.png" mode="scaleToFill"></image>
 					<view class="title">退出登录</view>
 				</view>
 				<u-icon name="arrow-right" color="#666" size="16"></u-icon>
@@ -335,8 +335,8 @@
 				color: #666;
 				
 				image {
-					width: 44rpx;
-					height: 44rpx;
+					width: 52rpx;
+					height: 52rpx;
 					margin-right: 20rpx;
 				}
 				
@@ -345,14 +345,9 @@
 					line-height: 30rpx;
 				}
 				
-				.addr {
-					width: 38rpx;
-					height: 46rpx;
-				}
-				
 				.close {
-					width: 50rpx;
-					height: 46rpx;
+					width: 62rpx;
+					height: 62rpx;
 				}
 			}
 		}