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

www/webapp/housekeeping/src/App.vue

@@ -39,4 +39,7 @@ export default {
 .vux-cell-value {
   color: #ffb433 !important;
 }
+.weui-dialog__bd {
+  /* text-align: left; */
+}
 </style>

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

@@ -2,7 +2,7 @@
   <div>
     <XHeader :left-options="{backText: ''}"
       style="border-bottom: 2px solid #dddddd;background:#fff;z-index:3;">兑换专区</XHeader>
-      <div class="bg_transparent"></div>
+    <div class="bg_transparent"></div>
     <scroller style="">
       <!-- <div class="header">
         <span @click='back'>返回</span>兑换专区
@@ -215,14 +215,14 @@ export default {
             return;
           } else {
             self.exchangeBtn = false;
-            console.log(data.data);
+            console.log(data.data.data);
             let tips = '客服人员将在一个工作日内联系您，请保持手机畅通。';
             let addressName = '服务';
-            if (tips) {
-              tips = '如有疑问请拨打电话400-8800-365';
-            }
-            if (addressName) {
+            console.log(data.data.data.gift.type);
+            console.log(data.data.data.gift.type != 1);
+            if (data.data.data.gift.type != 1) {
               addressName = '收货';
+              tips = '如有疑问请拨打电话400-8800-365';
             }
             weui.alert(
               `礼包名称：${
@@ -350,6 +350,7 @@ export default {
     font-size: 18px;
   }
 }
+
 .submit {
   background: #ffb433;
   color: rgb(255, 255, 255);
@@ -365,7 +366,7 @@ export default {
   transition: all 0.1s;
   &:active {
     font-size: 20px;
-    background: rgba(47, 0, 78, 0.81);
+    background: #ffb433c9;
   }
 }
 

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://common.yiguanjia.me/index.php?r=',
   // apiPath = 'http://127.0.0.1:3000/cros/?url=http://common.yiguanjia.me/index.php?r=',
   // 张工