update

mobile-code/src/components/app-coupon-sel.vue

@@ -82,7 +82,7 @@ export default {
 		},
 		// 优惠券选择
 		couponChange(index) {
-			this.couponSelInx = index
+			this.couponSelInx = this.couponSelInx == index ? null : index
 		}
 	}
 }

mobile-code/src/components/module/app-activily-coupon.vue

@@ -55,6 +55,7 @@ export default {
 
 <style lang="scss" scoped>
 	.app-activily-coupon {
+		height: 748px;
 		.coupon-wrap {
             position: relative;
             top: -370px;

mobile-code/src/pages/order/components/list.vue → mobile-code/src/components/module/order-list.vue

@@ -2,7 +2,7 @@
 	<div class="list-module">
 		<div class="list-left">
 			<div class="image">
-				<img src="../../../static/images/logout.png" alt />
+				<img src="../../static/images/logout.png" alt />
 			</div>
 			<div class="list-msg">
 				<div class="title">天使面孔</div>

mobile-code/src/main.js

@@ -29,7 +29,7 @@ Vue.config.productionTip = false
 import store from './store'
 Vue.prototype.$store = store
 
-Vue.prototype.$toast = (title) => (
+Vue.prototype.$msg = (title) => (
 	uni.showToast({
 		title,
 		icon: 'none'
@@ -37,11 +37,11 @@ Vue.prototype.$toast = (title) => (
 )
 
 // 生产环境中控制台不打印普通信息，以免造成内存泄漏
-// if (process.env.NODE_ENV == 'production') {
-// 	if (console) {
-// 		console.log = () => {}
-// 	}
-// }
+if (process.env.NODE_ENV == 'production') {
+	if (console) {
+		console.log = () => {}
+	}
+}
 
 App.mpType = 'app'
 const app = new Vue({

mobile-code/src/pages/callback/index.vue

@@ -25,14 +25,14 @@
 				<!-- 一个主按钮 -->
 				<template v-if="false">
 					<div class="call-btn-com call-one-btn">
-						<div class="button-com success">余额支付</div>
+						<button class="button-com success">余额支付</button>
 					</div>
 				</template>
 				<!-- 两个主按钮 -->
 				<template v-else>
 					<div class="call-btn-com call-two-btn">
-                        <div class="button-com default">查看订单</div>
-                        <div class="button-com">返回首页</div>
+                        <button class="button-com default">查看订单</button>
+                        <button class="button-com">返回首页</button>
 					</div>
 				</template>
 			</div>

mobile-code/src/pages/coupon/list.vue

@@ -31,7 +31,7 @@
 						</div>
                         <!-- 未使用 -->
 						<template v-if="tabIndex == 0">
-							<div class="button-com success">去使用</div>
+							<button class="button-com red">去使用</button>
 						</template>
                         <!-- 已使用 -->
 						<template v-else-if="tabIndex == 1">

mobile-code/src/pages/goods/components/buy-foot.vue

@@ -11,7 +11,7 @@
             </div>
         </div>
         <div class="btn-right">
-            <div class="button-com success" @click="buy">立即购买</div>
+            <button class="button-com red" @click="buy">立即购买</button>
         </div>
     </div>
 </template>

mobile-code/src/pages/goods/components/sel-popup.vue

@@ -35,7 +35,7 @@
 					</div>
 				</scroll-view>
 				<div class="tui-popup-btn">
-                    <div class="button-com success">下一步</div>
+                    <button class="button-com red">下一步</button>
 				</div>
 			</div>
         </bottom-popup>

mobile-code/src/pages/order/detail.vue

@@ -97,17 +97,17 @@
 				</span>
 			</div>
 			<template v-if="false">
-				<div class="button-com success">立即支付</div>
+				<button class="button-com red">立即支付</button>
 			</template>
 			<template v-else>
-				<div class="button-com default">填写收花地址</div>
+				<button class="button-com default">填写收花地址</button>
 			</template>
 		</div>
 	</div>
 </template>
 
 <script>
-import listModule from './components/list'
+import listModule from '@/components/module/order-list'
 import appCoupon from '@/components/app-coupon-sel'
 export default {
 	name: 'order-detail',
@@ -182,7 +182,7 @@ export default {
 			margin-bottom: 8px;
 			margin-left: 4px;
 		}
-		.success {
+		.red {
 			width: 270px;
 		}
 		.default {

mobile-code/src/pages/order/list.vue

@@ -13,14 +13,14 @@
 					<span>应付金额：</span>
 					<span class="app-size-30 app-bold">¥580.00</span>
 				</div>
-				<div class="button-com success">立即付款</div>
+				<button class="button-com red">立即付款</button>
 			</div>
 		</div>
 	</div>
 </template>
 
 <script>
-import listModule from './components/list'
+import listModule from '@/components/module/order-list'
 export default {
 	name: 'order-list',
 	components: {

mobile-code/src/pages/pay/index.vue

@@ -4,7 +4,7 @@
 		<app-tabs :tabs="tabs" :currentTab="tabIndex" :isFixed="true" :borderLeft="true" @change="tabChange" itemWidth="50%" />
 		<!-- </div> -->
 		<!-- 直接付款 -->
-		<template v-if="true">
+		<template v-if="tabIndex == 0">
 			<div class="logo-wrap">
 				<div class="logo-img">
 					<img src="../../static/images/user/attr-default.png" alt mode="widthFix" />
@@ -19,8 +19,8 @@
 				</div>
 				<!-- 按钮 -->
 				<div class="btn-wrap">
-					<div class="button-com success">余额支付</div>
-					<div class="button-com success">微信支付</div>
+					<button class="button-com red" @click="_pay">余额支付</button>
+					<button class="button-com green" @click="_pay">微信支付</button>
 				</div>
 			</div>
 		</template>
@@ -82,6 +82,10 @@ export default {
 			})
 		},
 		_pay() {
+			if (!this.amount) {
+				this.$msg('请先输入金额！')
+				return false
+			}
 			let params = {
 				prePrice: this.amount,
 				sourceType: 1,

mobile-code/src/pages/shop/index.vue

@@ -19,7 +19,7 @@
 						<div class="list-val">15392387653</div>
 					</div>
 					<div class="list-icon">
-						<i class="iconfont iconshoujihao"></i>
+						<i class="iconfont iconditu"></i>
 					</div>
 				</tui-list-cell>
 				<tui-list-cell @click="detail" :lineLeft="false" :lineRight="false" class="tui-list">
@@ -28,7 +28,7 @@
 						<div class="list-val">福建省厦门市湖里区蔡塘广场 -1220号</div>
 					</div>
 					<div class="list-icon">
-						<i class="iconfont iconshoujihao"></i>
+						<i class="iconfont icondianhua"></i>
 					</div>
 				</tui-list-cell>
 			</tui-list-view>
@@ -93,6 +93,10 @@ export default {
 				}
 			}
 			.list-icon {
+				.iconfont {
+					color: $mainColor;
+					font-weight: bold;
+				}
 			}
 		}
 	}

mobile-code/src/pages/user/index.vue

@@ -7,7 +7,7 @@
 					<img src="../../static/images/user/attr-default.png" alt mode="widthFix" />
 				</div>
 				<div class="button-wrap">
-					<div class="button-com" @click="showPopup">申请会员</div>
+					<button class="button-com" @click="showPopup">申请会员</button>
 				</div>
 			</template>
 			<!-- 未登录 -->
@@ -40,8 +40,8 @@
 				<div class="my-surplus">0.00</div>
 			</div>
 			<div class="surplus-right">
-				<div class="button-com">充值</div>
-				<div class="button-com success">付款</div>
+				<button class="button-com">充值</button>
+				<button class="button-com red">付款</button>
 			</div>
 		</div>
 		<div class="list-content">
@@ -98,7 +98,7 @@
 						<img src="../../static/images/user/attr-default.png" alt />
 					</div>
 					<div class="creat-account-btn">
-						<div class="button-com success">点击创建头像</div>
+						<button class="button-com red">点击创建头像</button>
 					</div>
 				</template>
 				<!-- 注册完成 -->
@@ -110,7 +110,7 @@
 						<div class="phone-num font-bold">13285979347</div>
 					</div>
 					<div class="creat-account-btn">
-						<div class="button-com success">点击创建头像</div>
+						<button class="button-com red">点击创建头像</button>
 					</div>
 				</template>
 				<!-- 关注公众号 -->
@@ -127,7 +127,7 @@
 									<div>花艺.品味.生活</div>
 								</div>
 							</div>
-							<div class="button-com wx-public-btn">查看</div>
+							<button class="button-com wx-public-btn">查看</button>
 						</div>
 					</div>
 				</template>

mobile-code/src/static/css/common.scss

@@ -54,13 +54,27 @@ page, body {
 	text-align: center;
 	line-height: 1;
 }
-.button-com.success {
+.button-com.red {
 	color: #fff;
 	background-color: $mainColor;
+	&:active {
+		background-color: rgb(245, 63, 85);
+	}
+}
+.button-com.green {
+	color: #fff;
+	background-color: #07BE0B;
+	border-color: #07BE0B;
+	&:active {
+		background-color: rgb(45, 194, 47);
+	}
 }
 .button-com.default {
 	color: $fontColor2;
 	border-color: #DDDDDD;
+	&:active {
+		background-color: #f5f5f5;
+	}
 }
 
 // 带统计字数文本域

mobile-code/src/utils/common.js

@@ -454,7 +454,7 @@ export function copyText(str) {
 	textarea.setSelectionRange(0, textarea.value.length)
 	const result = document.execCommand('Copy')
 	if (result) {
-		that.$toast('复制成功')
+		that.$msg('复制成功')
 	}
 	document.body.removeChild(textarea)
 	// #endif
@@ -464,7 +464,7 @@ export function copyText(str) {
 	uni.setClipboardData({
 		data: str,
 		success: function() {
-			that.$toast('复制成功')
+			that.$msg('复制成功')
 		}
 	})
 	// #endif