.

www/webapp/moonclub_new/src/view/exchange/index.vue

@@ -8,7 +8,7 @@
         <!-- name -->
         <div class="weui-cell">
           <div class="weui-cell__hd">
-            <label class="weui-label">姓名</label>
+            <label class="weui-label">姓<span class="white">白</span>名</label>
           </div>
           <div class="weui-cell__bd">
             <input v-model="user.name" class="weui-input" type="text" required="" maxlength="15" placeholder="输入你的姓名">
@@ -18,7 +18,7 @@
         <!-- mobile -->
         <div class="weui-cell">
           <div class="weui-cell__hd">
-            <label class="weui-label">手机</label>
+            <label class="weui-label">手<span class="white">白</span>机</label>
           </div>
           <div class="weui-cell__bd"><input v-model="user.mobile" class="weui-input" type="text" required="" maxlength="15" placeholder="输入你的手机">
           </div>
@@ -26,15 +26,15 @@
         <!-- 验证码 -->
         <div class="weui-cell">
           <div class="weui-cell__hd">
-            <label class="weui-label">验证码</label>
+            <label class="weui-label">识别码</label>
           </div>
-          <div class="weui-cell__bd"><input v-model="Vcode.enter" class="weui-input" type="text" required="" maxlength="15" placeholder="输入验证码">
+          <div class="weui-cell__bd"><input v-model="Vcode.enter" class="weui-input" type="text" required="" maxlength="15" placeholder="输入识别码">
           </div>
           <input type="button" @click='getCreateCode' v-model="Vcode.create" class="v-code">
         </div>
         <div class="weui-cell">
           <div class="weui-cell__hd">
-            <label class="weui-label">短信验证码</label>
+            <label class="weui-label">短信码</label>
           </div>
           <div class="weui-cell__bd"><input v-model="Vcode.sms.enter" class="weui-input" type="text" required="" maxlength="15" placeholder="输入短信验证码">
           </div>
@@ -42,20 +42,10 @@
             获取
           </div>
         </div>
-        <!-- 短信验证码 -->
-
-        <!-- code.num -->
-        <!-- <div class="weui-cell">
-          <div class="weui-cell__hd">
-            <label class="weui-label">兑换码</label>
-          </div>
-          <div class="weui-cell__bd"><input v-model="code.num" class="weui-input" type="text" required="" maxlength="15" placeholder="输入你的兑换码">
-          </div>
-        </div> -->
         <!-- address -->
         <div class="weui-cell">
           <div class="weui-cell__hd">
-            <label class="weui-label">收货地址</label>
+            <label class="weui-label">地<span class="white">白</span>址</label>
           </div>
           <div class="weui-cell__bd">
             <input v-model="user.address" class="weui-input" type="text" required="" maxlength="15" placeholder="如:上海市徐汇区天平路245号">
@@ -72,10 +62,10 @@
         <!-- code.num -->
         <div class="weui-cell">
           <div class="weui-cell__hd">
-            <label class="weui-label">编号</label>
+            <label class="weui-label">验证码</label>
           </div>
           <div class="weui-cell__bd">
-            <input v-model="code.num" class="weui-input" placeholder="输入你的兑换码编号">
+            <input v-model="code.num" class="weui-input" placeholder="输入你的验证码">
           </div>
         </div>
         <!-- 提交 -->
@@ -123,24 +113,25 @@ export default {
         weui.alert("请重新输入姓名!");
         return;
       }
-      // 验证地址
-      if (self.user.address == null) {
-        weui.alert("收货地址不为空!");
-        return;
-      }
+
       // 验证手机
       if (self.Vcode.sms.create != self.Vcode.sms.enter) {
-        weui.alert("手机验证失败,请重新验证!");
+        weui.alert("手机验证失败,因为短信码填写错误,请重新验证!");
+        return;
+      }
+      // 验证地址
+      if (self.user.address == null) {
+        weui.alert("地址不能为空!");
         return;
       }
       // 验证兑换码
       if (self.code.pwd == null) {
-        weui.alert("请输入兑换码!");
+        weui.alert("请输入兑换券上的兑换码!");
         return;
       }
       // 兑换码编号不为空
       if (self.code.num == null) {
-        weui.alert("请输入兑换码编号!");
+        weui.alert("请输入兑换券上的验证码!");
         return;
       }
       // 验证兑换码编号
@@ -159,15 +150,25 @@ export default {
         )
         .then(data => {
           if (!data.data.success) {
+            console.log(data.data);
             weui.alert(data.data.message);
             self.exchangeBtn = true;
             return;
           } else {
             self.exchangeBtn = false;
+            console.log(data.data);
+            let tips = '客服人员将在一个工作日内联系您，请保持手机畅通。';
+            let addressName = '服务';
+            if (tips) {
+              tips = '如有疑问请拨打电话400-8800-365';
+            }
+            if (addressName) {
+              addressName = '收货';
+            }
             weui.alert(
-              `礼包名称：${data.data.data.gift.title}。<br/>收货地址：${
+              `礼包名称：${data.data.data.gift.title}。<br/>${addressName}地址：${
                 self.user.address
-              }。<br/>如有疑问请拨打电话400-8800-365`,
+              }。<br/>${tips}`,
               function() {
                 self.$router.push("/");
               },
@@ -178,11 +179,6 @@ export default {
             );
             return;
           }
-          // console.log(data);
-          // weui.alert('兑换成功!');
-          // console.log(data);
-          // console.log(data.data.data.gift.desc);
-          // console.log(data.data.data.gift.title);
           /**
            * data.data.gift.desc
            */
@@ -328,4 +324,7 @@ export default {
   color: #c8c8cd;
   font-size: 16px;
 }
+.white{
+  color: white;
+}
 </style>