Merge branch 'master' of http://114.67.93.201/xulili/ybf

ybf_wx/src/views/goods/goodGrounding.vue

@@ -20,8 +20,8 @@
               <van-radio name="1" style="float:left;">固定金额</van-radio>
               <van-radio name="2" style="float:right;">成交价比例</van-radio>
             </van-radio-group>
-            <div class="fr">
-              <span class="fr" style="margin-top:16px;">元</span>
+            <div class="fr" v-if="type == 1">
+              <span class="fr" style="margin-top:18px;">元</span>
                 <van-field
                   class="price"
                   readonly
@@ -35,7 +35,23 @@
                   :show="show2"
                   @blur="show2 = false"
                 />
-              </div>
+            </div>
+            <div class="fr" v-if="type == 2">
+              <span class="fr" style="margin-top:18px;">%</span>
+                <van-field
+                  class="price"
+                  readonly
+                  clickable
+                  :value="percent"
+                  placeholder="请输入百分比"
+                  @touchstart.native.stop="show3 = true"
+                />
+                <van-number-keyboard
+                  v-model="percent"
+                  :show="show3"
+                  @blur="show3 = false"
+                />
+            </div>
           </div>
         </div>
       </van-cell>
@@ -43,7 +59,7 @@
         <template slot="default">
           <van-field
             v-model="startTime1"
-            placeholder="选择活动结束时间"
+            placeholder="选择活动开始时间"
             readonly="readonly"
             @click="startShow = true"
             class="nop"
@@ -53,7 +69,7 @@
               v-model="startTime"
               type="datetime"
               @cancel="startShow = false"
-              @confirm="startShow = false"
+              @confirm="handleStartTime"
               @change="startTimeChange"
             />
           </van-popup>
@@ -73,7 +89,7 @@
               v-model="endTime"
               type="datetime"
               @cancel="endShow = false"
-              @confirm="endShow = false"
+              @confirm="handleEndTime"
               @change="endTimeChange"
             />
           </van-popup>
@@ -107,26 +123,43 @@ export default {
     return {
       startTime: new Date(),
       startTime1: "",
-      endTime: "",
+      endTime: new Date(),
       endTime1: "",
       startShow: false,
       endShow: false,
       number: "",
-      type: "",
+      type: '1',
       show: false,
       show2: false,
-      price: ""
+      show3: false,
+      price: "",
+      percent: ""
     };
   },
   methods: {
+    timeFormat(time) {
+      let year = 1900 + time.getYear();
+      let month = "0" + (time.getMonth() + 1);
+      let date = "0" + time.getDate();
+      return year + "-" + month.substring(month.length-2, month.length)  + "-" + date.substring(date.length-2, date.length)
+       + " "
+    },
     startTimeChange(e) {
       let startTimeArr = e.getValues();
-      this.startTime1 = `${startTimeArr[0]}-${startTimeArr[1]}-${startTimeArr[2]}  ${startTimeArr[3]}:${startTimeArr[4]}:00`;
+      this.startTime1 = `${startTimeArr[0]}-${startTimeArr[1]}-${startTimeArr[2]}`;
     },
     endTimeChange(e) {
       let endTimeArr = e.getValues();
-      this.endTime1 = `${endTimeArr[0]}-${endTimeArr[1]}-${endTimeArr[2]}  ${endTimeArr[3]}:${endTimeArr[4]}:00`;
-    }
+      this.endTime1 = `${endTimeArr[0]}-${endTimeArr[1]}-${endTimeArr[2]}`;
+    },
+    handleStartTime(value) {
+      this.startTime1 = this.timeFormat(value)
+      this.startShow = false
+    },
+    handleEndTime(value) {
+      this.endTime1 = this.timeFormat(value)
+      this.endShow = false
+    },
   }
 };
 </script>
@@ -215,6 +248,9 @@ h3 {
 .phone {
   float: left;
 }
+.option {
+  margin-top: 10px;
+}
 .option >>> .van-field__control {
   text-align: right;
 }

ybf_wx/src/views/task/taskList.vue

@@ -24,7 +24,7 @@
           </van-cell>
         </van-list>
       </van-tab>
-      <van-tab title="顾客流失">
+      <van-tab title="复购">
          <van-list v-model="writeOff" :finished="finished" @load="onLoad">
           <van-cell
             :value="item.number"
@@ -40,7 +40,7 @@
           </van-cell>
         </van-list>
       </van-tab>
-      <van-tab title="拉接受问询">
+      <van-tab title="接受问询">
          <van-list v-model="writeOff" :finished="finished" @load="onLoad">
           <van-cell
             :value="item.number"