Merge branch 'dev' of http://gitlab.jdshangmen.com/jiedao-app/jiedao-app-operator into dev

src/views/ecw/bannerPop/index.vue

@@ -99,14 +99,10 @@
           <el-input v-model="form.titleEn" placeholder="请输入英文标题" />
         </el-form-item>
         <el-form-item label="有效期" prop="validateStart">
-          <el-date-picker v-model="form.validateStart" @change="startChange"
-            type="date"
-            placeholder="选择日期" value-format="yyyy-MM-dd">
+          <el-date-picker type="datetime" :placeholder="$t('请选择日期')" value-format="yyyy-MM-dd HH:mm:ss" v-model="form.validateStart" @change="startChange">
           </el-date-picker>
           ~
-          <el-date-picker v-model="form.validateEnd"
-            type="date"
-            placeholder="选择日期" value-format="yyyy-MM-dd">
+          <el-date-picker type="datetime" :placeholder="$t('请选择日期')" value-format="yyyy-MM-dd HH:mm:ss" v-model="form.validateEnd">
           </el-date-picker>
           <span style="color:red;font-size:14px;">注意：留空则表示永久有效</span>
         </el-form-item>
@@ -223,7 +219,7 @@ export default {
     formatTime() {
       return millisecond => {
         if(millisecond) {
-          return new Date(millisecond).format('yyyy-MM-dd');
+          return new Date(millisecond).format('yyyy-MM-dd hh:mm:ss');
         }
         return '';
       }
@@ -317,6 +313,9 @@ export default {
       const id = row.id;
       getBannerPop(id).then(response => {
         this.form = response.data;
+		this.form.validateStart = this.parseTime(response.data.validateStart);
+		this.form.validateEnd = this.parseTime(response.data.validateEnd);
+		console.log(this.form);
         this.open = true;
         this.title = "修改广告弹窗";
       });

src/views/ecw/financial/creatCollection.vue

@@ -862,10 +862,10 @@ export default {
         const dollarList = this.form.receiptAccountList.filter(v => v.collectionCurrencyId == 1)
         const dollar = dollarList.reduce((total, currentValue) => NP.plus(total, currentValue.collectionAmount), 0)
 
-        const rmbList = this.form.receiptAccountList.filter(v => v.collectionCurrencyId == 2)
+        const rmbList = this.form.receiptAccountList.filter(v => v.collectionCurrencyId == 3)
         const rmb = rmbList.reduce((total, currentValue) => NP.plus(total, currentValue.collectionAmount), 0)
 
-        const nairaList = this.form.receiptAccountList.filter(v => v.collectionCurrencyId == 3)
+        const nairaList = this.form.receiptAccountList.filter(v => v.collectionCurrencyId == 2)
         const naira = nairaList.reduce((total, currentValue) => NP.plus(total, currentValue.collectionAmount), 0)
 
         this.form.receiptAccountList[this.form.receiptAccountList.length -1].collectionAmount = [dollar, rmb, naira]