Merge branch 'master' of git.oschina.net:yiguanjia/php

www/webapp/housekeeping/src/components/exchange/exchange.vue

@@ -115,7 +115,8 @@
           </div>
         </div>
         <!-- code.num -->
-        <div class="weui-cell">
+        <!-- 2018-08-06:09:42:10  注释 -->
+        <!-- <div class="weui-cell">
           <div class="weui-cell__hd">
             <label class="weui-label">
               <span>验证码</span>
@@ -126,7 +127,7 @@
               class="weui-input"
               placeholder="输入你的验证码">
           </div>
-        </div>
+        </div> -->
         <!-- 提交 -->
         <div class="submit" @click="exchange()">兑换</div>
       </div>
@@ -189,15 +190,17 @@ export default {
         return;
       }
       // 兑换码编号不为空
+      /* 2018-08-06:09:42:10  注释
       if (self.code.num == null) {
         weui.alert('请输入兑换券上的验证码!');
         return;
-      }
+      } */
       // 验证兑换码编号
+      /* 2018-08-06:09:42:10  注释
       if (isNaN(self.code.num)) {
         weui.alert('您输入的编号有误，请重新输入！');
         return;
-      }
+      } */
       self.exchangeBtn = false;
       axios
         .get(
@@ -205,7 +208,7 @@ export default {
             self.user.name
           }&mobile=${self.user.mobile}&address=${self.user.address}&pwd=${
             self.code.pwd
-          }&coding_num=${self.code.num}`,
+          }`,
         )
         .then((data) => {
           if (!data.data.success) {

www/webapp/housekeeping/src/config/globalVariables.js

@@ -40,7 +40,7 @@ if (test) {
 }
 // 判断是否为dev开发
 if (locationHref.indexOf('80') > -1) {
-  apiPath = 'https://bird.ioliu.cn/v1?url=http://commontest.yiguanjia.me/index.php?r=',
+  apiPath = 'https://bird.ioliu.cn/v1?url=http://common.yiguanjia.me/index.php?r=',
   // apiPath = 'http://commontest.yiguanjia.me/index.php?r=',
   // apiPath = 'http://127.0.0.1:3000/cros/?url=http://common.yiguanjia.me/index.php?r=',
   // 张工