Merge remote-tracking branch 'origin/developer' into developerA

src/views/member/coupon/edit.vue

@@ -1,9 +1,15 @@
+<!-- eslint-disable space-before-function-paren -->
+<!-- eslint-disable space-before-function-paren -->
 <template>
   <div ref="scrollDiv" class="app-container">
     <div v-if="editType === 'add'" class="filter-container">
       <div class="filter-control">
-        <span style="color: red;">在本页面，对每三个月给超级会员自动发放的优惠券进行配置，配置完成后下一阶段才生效（最少配置1个，最多5个）。</span>
-        <el-button type="primary" icon="el-icon-plus" size="mini" :disabled="disabled" @click="handleAddList">新增优惠券</el-button>
+        <span style="color: red">
+          在本页面，对每三个月给超级会员自动发放的优惠券进行配置，配置完成后下一阶段才生效（最少配置1个，最多5个）。
+        </span>
+        <el-button type="primary" icon="el-icon-plus" size="mini" :disabled="disabled" @click="handleAddList">
+          新增优惠券
+        </el-button>
       </div>
     </div>
     <div v-else class="filter-container">
@@ -15,7 +21,7 @@
           clearable
           suffix-icon="el-icon-date"
           :disabled="true"
-          style="width:100px;"
+          style="width: 100px"
         />
         -
         <el-input
@@ -24,14 +30,23 @@
           clearable
           suffix-icon="el-icon-date"
           :disabled="true"
-          style="width:100px;"
+          style="width: 100px"
         />
-        <el-button type="primary" icon="el-icon-plus" size="mini" :disabled="disabled" style="margin-left: 30px;" @click="handleAddList">新增优惠券</el-button>
+        <el-button
+          type="primary"
+          icon="el-icon-plus"
+          size="mini"
+          :disabled="disabled"
+          style="margin-left: 30px"
+          @click="handleAddList"
+        >
+          新增优惠券
+        </el-button>
       </div>
     </div>
     <el-form ref="couponFrom" :model="form" label-width="100px">
-      <div v-for="(formItem,index) in form.formList" :key="formItem.key" class="form-cell" :data-key="formItem.key">
-        <el-form-item :label="`优惠券${index+1}:`" style="margin-bottom: 10px;" :rules="rules.couponType">
+      <div v-for="(formItem, index) in form.formList" :key="formItem.key" class="form-cell" :data-key="formItem.key">
+        <el-form-item :label="`优惠券${index + 1}:`" style="margin-bottom: 10px" :rules="rules.couponType">
           <el-radio-group v-model="formItem.couponType">
             <el-radio :label="0">活动券</el-radio>
             <el-radio :label="1">品类券</el-radio>
@@ -41,7 +56,15 @@
         <template v-if="formItem.couponType === 3">
           <el-form-item label="供应商" :prop="`formList.${index}.shopData`" :rules="rules.shopData">
             <template v-if="formItem.shopData && formItem.shopData.length === 0">
-              <el-button type="primary" autofocussize="mini" size="mini" icon="el-icon-plus" @click="handleShopDialogVisible(index)">选择供应商</el-button>
+              <el-button
+                type="primary"
+                autofocussize="mini"
+                size="mini"
+                icon="el-icon-plus"
+                @click="handleShopDialogVisible(index)"
+              >
+                选择供应商
+              </el-button>
               <el-checkbox-group v-show="false" v-model="formItem.shopData" />
             </template>
             <template v-else>
@@ -55,7 +78,7 @@
                   </template>
                 </el-table-column>
                 <el-table-column label="操作" align="center">
-                  <el-button type="text" @click="deleteShop(formItem,index)">删除</el-button>
+                  <el-button type="text" @click="deleteShop(formItem, index)">删除</el-button>
                 </el-table-column>
               </el-table>
             </template>
@@ -66,31 +89,45 @@
         </el-form-item>
         <el-form-item label="优惠条件:" :prop="`formList.${index}.touchPrice`" :rules="rules.touchPrice">
           <el-input v-model="formItem.touchPrice" style="width: 220px" size="mini">
-            <template slot="prepend" style="padding: 0 10px;">订单商品总额满：</template>
+            <template slot="prepend" style="padding: 0 10px">订单商品总额满：</template>
           </el-input>
         </el-form-item>
-        <el-form-item label="优惠商品:" :hidden="formItem.couponType === 0 ? false : true" style="margin-bottom: 10px;" :rules="rules.productType">
+        <el-form-item
+          label="优惠商品:"
+          :hidden="formItem.couponType === 0 ? false : true"
+          style="margin-bottom: 10px"
+          :rules="rules.productType"
+        >
           <el-radio-group v-model="formItem.productType">
             <el-radio :label="'1'">全商城商品</el-radio>
             <el-radio :label="'2'">指定商品</el-radio>
           </el-radio-group>
         </el-form-item>
-        <template v-if="formItem.productType === '2'&& formItem.couponType === 0">
+        <template v-if="formItem.productType === '2' && formItem.couponType === 0">
           <el-form-item label="商品信息" :prop="`formList.${index}.associateList`" :rules="rules.associateList">
-            <el-button type="primary" icon="el-icon-sort" size="mini" :disabled="disabled3(formItem.associateList)" @click="handleOnInputBlur(formItem,index)">一键排序</el-button>
-            <el-button type="primary" icon="el-icon-plus" size="mini" @click="handleGoodDialogVisible(index)">添加商品</el-button>
+            <el-button
+              type="primary"
+              icon="el-icon-sort"
+              size="mini"
+              :disabled="disabled3(formItem.associateList)"
+              @click="handleOnInputBlur(formItem, index)"
+            >
+              一键排序
+            </el-button>
+            <el-button type="primary" icon="el-icon-plus" size="mini" @click="handleGoodDialogVisible(index)">
+              添加商品
+            </el-button>
             <el-checkbox-group v-show="false" v-model="formItem.associateList" />
-            <el-table v-show="formItem.associateList && formItem.associateList.length>0" :data="formItem.associateList" border>
+            <el-table
+              v-show="formItem.associateList && formItem.associateList.length > 0"
+              :data="formItem.associateList"
+              border
+            >
               <el-table-column property="mainImage" label="商品图片" align="center" width="80">
                 <template slot-scope="{ row }">
-                  <el-popover
-                    placement="top-start"
-                    title=""
-                    width="180"
-                    trigger="hover"
-                  >
-                    <img :src="row.mainImage" alt="" style="width:150px;height:150px;">
-                    <img slot="reference" :src="row.mainImage" alt="" style="width:30px;height:30px;">
+                  <el-popover placement="top-start" title="" width="180" trigger="hover">
+                    <img :src="row.mainImage" alt="" style="width: 150px; height: 150px" />
+                    <img slot="reference" :src="row.mainImage" alt="" style="width: 30px; height: 30px" />
                   </el-popover>
                 </template>
               </el-table-column>
@@ -119,25 +156,34 @@
                 </template>
               </el-table-column>
               <el-table-column label="排序" align="center" width="100">
-                <template slot-scope="{row}">
+                <template slot-scope="{ row }">
                   <el-input v-model="row.sort" maxlength="4" minlength="1" />
                 </template>
               </el-table-column>
               <el-table-column label="操作" align="center">
                 <template slot-scope="scope">
-                  <el-button type="text" @click="handleDeletePros(formItem,scope.$index)">删除</el-button>
+                  <el-button type="text" @click="handleDeletePros(formItem, scope.$index)">删除</el-button>
                 </template>
               </el-table-column>
             </el-table>
           </el-form-item>
         </template>
-        <el-form-item label="优惠品类:" :hidden="formItem.couponType ===1 ? false : true" :rules="rules.categoryType">
+        <el-form-item label="优惠品类:" :hidden="formItem.couponType === 1 ? false : true" :rules="rules.categoryType">
           <el-radio-group v-model="formItem.categoryType">
             <el-radio :label="'1'">产品</el-radio>
             <el-radio :label="'2'">仪器</el-radio>
           </el-radio-group>
         </el-form-item>
-        <el-button class="delete_label" :disabled="disabled1" icon="el-icon-delete" size="mini" type="danger" @click="handleDelete(formItem,index)">删除</el-button>
+        <el-button
+          class="delete_label"
+          :disabled="disabled1"
+          icon="el-icon-delete"
+          size="mini"
+          type="danger"
+          @click="handleDelete(formItem, index)"
+        >
+          删除
+        </el-button>
       </div>
     </el-form>
     <div class="el-dialog__footer">
@@ -163,7 +209,7 @@ const defaultForm = () => {
     touchPrice: '',
     productType: '1',
     categoryType: '1',
-    associateList: []// 指定商品信息
+    associateList: [] // 指定商品信息
   }
 }
 export default {
@@ -171,10 +217,6 @@ export default {
   components: { goodDialog, shopDialog },
   data() {
     return {
-      defaultShop: {
-        shopId: 0,
-        shopData: []
-      },
       form: {
         formList: []
       },
@@ -244,13 +286,12 @@ export default {
       if (data.coupons.length > 0) {
         this.delFlag = true
         this.form.formList = data.coupons.map((el) => {
-          el = { ...el, ...this.defaultShop }
+          el.shopData = []
           if (el.shop) {
             el.shopData.push(el.shop)
           }
           return el
         })
-        console.log('formList', this.form.formList)
       } else {
         for (let i = 0; i <= 2; i++) {
           this.form.formList.push(defaultForm())
@@ -305,7 +346,7 @@ export default {
       })
     },
     onSubmit(formName) {
-      this.$refs[formName].validate(valid => {
+      this.$refs[formName].validate((valid) => {
         if (valid) {
           this.handleFormParams()
           this.$confirm('是否提交数据', '提示', {
@@ -431,7 +472,7 @@ export default {
 </script>
 
 <style>
-.form-cell{
+.form-cell {
   border: 1px solid #e1e1e1;
   border-radius: 8px;
   box-sizing: border-box;
@@ -440,7 +481,7 @@ export default {
   position: relative;
   margin-bottom: 20px;
 }
-.delete_label{
+.delete_label {
   position: absolute;
   right: 2%;
   top: 20px;

src/views/serviceSettlement/list/edit.vue

@@ -19,8 +19,8 @@
           />
         </el-select>
       </el-form-item>
-      <el-form-item label="服务商地区：" prop="area">
-        <el-cascader
+      <el-form-item label="服务商地区：" prop="address">
+        <!--<el-cascader
           ref="cascader"
           :key="areaKey"
           v-model="formLabelAlign.area"
@@ -30,7 +30,8 @@
           style="width: 100%"
           :placeholder="cascaderPlaceholder"
           @change="handleChange"
-        />
+        />-->
+        <el-input v-model="formLabelAlign.address" placeholder="请服务商地区" />
       </el-form-item>
       <el-form-item label="服务商类型：" prop="serviceCategory">
         <el-select v-model="formLabelAlign.serviceCategory" placeholder="服务商类型">
@@ -164,7 +165,7 @@ export default {
           { required: true, message: '请输入服务商名称', trigger: 'blur' },
           { max: 50, message: '长度最多50个汉字', trigger: 'blur' }
         ],
-        area: [{ required: true, message: '请选择地址', trigger: 'change' }],
+        address: [{ required: true, message: '请输入地址', trigger: 'blur' }],
         serviceLevel: [
           { required: true, message: '请选择服务商级别', trigger: 'change' }
         ],
@@ -232,9 +233,6 @@ export default {
       this.textRelateds = data.textRelateds.map((e, i) => ({ uid: i, url: e.image }))
       this.formLabelAlign.area = data.address.split('/').map(e => e.trim())
       this.qualificationImage = data.qualificationImage
-      setTimeout(() => {
-        this.areaKey = Math.random() * 1000
-      }, 500)
     },
     // 地区选择
     handleChange($event) {