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

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

@@ -111,7 +111,7 @@
               type="text"
               required=""
               maxlength="15"
-              placeholder="输入你的兑换码密码">
+              placeholder="输入兑换码(不区分大小写)">
           </div>
         </div>
         <!-- code.num -->

www/webapp/housekeeping/src/components/management/list.vue

@@ -18,7 +18,8 @@
           <span></span>
         </div>
         <div class="tab" v-bind:class="{ active: isActive === 3}"
-          @click='tabF(3)'>已取消</div>
+          @click='tabF(3)'>已取消
+        </div>
       </div>
     </div>
     <div style="z-index: -1">
@@ -41,22 +42,28 @@
             <div class="name">{{item.user_name}}</div>
             <!--地址-->
             <div v-if="item.status == 1">
-              <span class="title">地址：</span>{{item.address}}</div>
+              <span class="title">地址：</span>{{item.address}}
+            </div>
             <!--日期-->
             <div v-if="item.status == 1 || item.status == 4">
-              <span class="title">创建：</span>{{item.time_str}}</div>
+              <span class="title">创建：</span>{{item.time_str}}
+            </div>
             <!--面试-->
             <div v-if="item.status == 2">
-              <span class="title">面试：</span>{{item.status_time_str}}</div>
+              <span class="title">面试：</span>{{item.status_time_str}}
+            </div>
             <!--人员-->
             <div v-if="item.status == 2 || item.status == 3">
-              <span class="title">人员：</span>{{item.tech}}</div>
+              <span class="title">人员：</span>{{item.tech}}
+            </div>
             <!--签约-->
             <div v-if=" item.status == 3">
-              <span class="title">状态：</span>{{item.contract_str}}</div>
+              <span class="title">状态：</span>{{item.contract_str}}
+            </div>
             <!--原因-->
             <div v-if="item.status == 4">
-              <span class="title">原因：</span>{{item.cancel_cause}}</div>
+              <span class="title">原因：</span>{{item.cancel_cause}}
+            </div>
           </div>
         </div>
       </div>
@@ -173,14 +180,14 @@ export default {
               if (result.status === 200) {
                 self.oldOrderList = result.data.rows;
                 /*for (let i = 0; i < self.oldOrderList.length; i++) {
-                self.oldOrderList[i].time_str = _.timetrans(self.oldOrderList[i].time);
-                self.oldOrderList[i].time_str = self.oldOrderList[i].time_str.split(' ')[0];
-                self.oldOrderList[i].yc_time = _.timetrans(self.oldOrderList[i].yc_time);
-                if (self.oldOrderList[i].status !== 1) {
-                  self.oldOrderList[i].status_time = _.timetrans(self.oldOrderList[i].status_time);
-                  self.oldOrderList[i].status_time_str = self.oldOrderList[i].status_time.splice(' ')[0];
-                }
-              }*/
+                  self.oldOrderList[i].time_str = _.timetrans(self.oldOrderList[i].time);
+                  self.oldOrderList[i].time_str = self.oldOrderList[i].time_str.split(' ')[0];
+                  self.oldOrderList[i].yc_time = _.timetrans(self.oldOrderList[i].yc_time);
+                  if (self.oldOrderList[i].status !== 1) {
+                    self.oldOrderList[i].status_time = _.timetrans(self.oldOrderList[i].status_time);
+                    self.oldOrderList[i].status_time_str = self.oldOrderList[i].status_time.splice(' ')[0];
+                  }
+                }*/
                 self.tabF(0);
                 loading.hide(function() {
                   // console.log('`loading` has been hidden');
@@ -223,7 +230,7 @@ export default {
           }
         }
       }
-      console.log(self.orderList);
+      // console.log(self.orderList);
       // 日期转时间戳 2014-07-10
       function ycTime(t) {
         let stringTime = t + ' 00:00:00';
@@ -245,8 +252,8 @@ export default {
       _.oldOrder = item;
       // console.log(item);
       /*console.log(item);
-        console.log(item.id);
-        console.log(item.flag);*/
+          console.log(item.id);
+          console.log(item.flag);*/
       if (item.flag == 0) {
         _.$http(
           '/j/HouseKeeping/Flag',
@@ -265,11 +272,11 @@ export default {
       }
       // 转化时间格式
       /*item.yc_time = _.timetrans(item.yc_time); // 预产期
-        item.yc_time = item.yc_time.substring(0, 10); // 预产期
-        item.server_start_time = _.timetrans(item.server_start_time);
-        item.server_start_time = item.server_start_time.substring(11, 16);
-        item.server_end_time = _.timetrans(item.server_end_time);
-        item.server_end_time = item.server_end_time.substring(11, 16);*/
+          item.yc_time = item.yc_time.substring(0, 10); // 预产期
+          item.server_start_time = _.timetrans(item.server_start_time);
+          item.server_start_time = item.server_start_time.substring(11, 16);
+          item.server_end_time = _.timetrans(item.server_end_time);
+          item.server_end_time = item.server_end_time.substring(11, 16);*/
       function edit() {
         setTimeout(function() {
           _.oldOrderInfo = item;

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://common.yiguanjia.me/index.php?r=',
+  apiPath = 'https://bird.ioliu.cn/v1?url=http://commontest.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=',
   // 张工
@@ -55,7 +55,7 @@ if (locationHref.indexOf('80') > -1) {
   // 立秋:客户
   // userId = '5823fe6ca84ea02e3e8b45cb'
   // 邓涛
-  // userId = '5a5eeaf3fb48a770708b456b' // 已注册
+  // userId = '5a603956fb48a70c768b4575' // 已注册
   // userId = '586def95a84ea01b348b4583'  // 未注册
   // 家政人员
   // userId = '57fa51649f5160c4048b4948'; // 我喂自己袋盐