1

mer_mer_admin/src/router/modules/marketing.js

@@ -170,27 +170,27 @@ const marketingRouter = {
         },
       ],
     },
-    {
-      path: 'settings',
-      name: 'settings',
-      meta: {
-        title: '营销设置',
-        noCache: true,
-      },
-      redirect: 'noRedirect',
-      component: () => import('@/views/marketing/settings/index'),
-      children: [
-        {
-          path: 'deliveryFee',
-          name: 'DeliveryFee',
-          meta: {
-            title: '配送费设置',
-            noCache: true,
-          },
-          component: () => import('@/views/marketing/settings/deliveryFee/index'),
-        },
-      ],
-    },
+    // {
+    //   path: 'settings',
+    //   name: 'settings',
+    //   meta: {
+    //     title: '营销设置',
+    //     noCache: true,
+    //   },
+    //   redirect: 'noRedirect',
+    //   component: () => import('@/views/marketing/settings/index'),
+    //   children: [
+    //     {
+    //       path: 'deliveryFee',
+    //       name: 'DeliveryFee',
+    //       meta: {
+    //         title: '配送费设置',
+    //         noCache: true,
+    //       },
+    //       component: () => import('@/views/marketing/settings/deliveryFee/index'),
+    //     },
+    //   ],
+    // },
   ],
 };
 

mer_mer_admin/src/views/login/index.vue

@@ -133,8 +133,8 @@ export default {
         },
       },
       loginForm: {
-        account: '18292417675',
-        pwd: '000000',
+        account: '',//18292417675
+        pwd: '',//000000
         captchaVO: {},
       },
       loginRules: {

mer_mer_admin/src/views/systemSetting/modifyStoreInfo/index.vue

@@ -114,6 +114,16 @@
             <el-form-item v-if="merInfoForm.serviceType === 'phone'" label="电话：" prop="servicePhone">
               <el-input v-model.trim="merInfoForm.servicePhone" class="width100"></el-input>
             </el-form-item>
+			<el-form-item label="设置起送费：" prop="deliveryFee">
+			  <el-input-number
+			    v-model.trim="merInfoForm.deliveryFee"
+			   :min="0"
+			   :max="9999"
+			   :step="0.1"
+			   step-strictly
+			   label="设置起送费"
+			  ></el-input-number>
+			</el-form-item>			
             <el-form-item label="警戒库存：" prop="alertStock">
               <el-input-number
                 v-model.trim="merInfoForm.alertStock"
@@ -122,7 +132,7 @@
                 label="警戒库存"
               ></el-input-number>
             </el-form-item>
-            <el-form-item label="自提开关：" prop="alertStock">
+            <el-form-item label="自提开关：" prop="isTakeTheir">
               <el-switch
                 v-model="merInfoForm.isTakeTheir"
                 :active-value="true"
@@ -269,6 +279,7 @@ export default {
         intro: '',
         keywords: '',
         alertStock: 1,
+		deliveryFee: 0,
         addressDetail: '',
         serviceType: '',
         serviceLink: null,
@@ -289,6 +300,7 @@ export default {
         rectangleLogo: [{ required: true, message: '请上传商户logo（横）', trigger: 'change' }],
         labelarr: [{ required: true, validator: validateVal, trigger: 'blur' }],
         alertStock: [{ required: true, message: '请输入警戒库存', trigger: 'blur' }],
+		deliveryFee: [{ required: true, message: '请输入起送费', trigger: 'blur' }],
         serviceType: [{ required: true, message: '请选择客服类型', trigger: 'change' }],
         serviceLink: [{ required: true, message: '请输入H5链接', trigger: 'blur' }],
         servicePhone: [{ required: true, validator: checkPhone, trigger: 'blur' }],

mer_mer_admin/src/views/systemSetting/prefernMeasure/creatMeasure.vue

@@ -32,25 +32,40 @@
 		<div class="from-tips mb5" v-if="formValidate.measureId && formValidate.isSetting==true">设置{{formValidate.measureLabel}}具体数值。</div>
 	  </el-form-item>
 	  <el-form-item :label="formValidate.measureLabel" prop="measureValue" v-show="formValidate.isSetting==true">
-	   <el-input-number
-	     v-model.trim="formValidate.measureValue"
-	     :min="0"
-	     :max="99"
-	     :step="0.1"
-	     step-strictly
-	     placeholder="请输入参数"
-	     label="参数"
-	   ></el-input-number>  
-	     <el-select v-model.trim="formValidate.unit" placeholder="请选择" :style="{ width: '25%' }" clearable>
-		   <el-option label="元" value="元" />
-		   <el-option label="件" value="件" />
-		   <el-option label="只" value="只" />
-		   <el-option label="份" value="份" />
-		   <el-option label="个" value="个" />
-		   <el-option label="袋" value="袋" />
-		   <el-option label="其他" value="其他" />
-		  </el-select>
-	    <div class="from-tips mb5">优惠措施对应参数值如1，单位输入元。表示优惠1元。</div>
+		<div v-if="formValidate.measureLabel=='满减大促：'">
+		 <span class="from-tips mb5">满  </span>
+		 <el-input-number
+		   v-model.trim="formValidate.measureValue1"
+		   :min="0"
+		   :max="99"
+		   :step="0.1"
+		   step-strictly
+		   placeholder="请输入参数"
+		   label="参数"
+		 ></el-input-number><span class="from-tips mb5">元</span>
+		 <span style="padding-left: 20px;" class="from-tips mb5">减  </span>
+		  <el-input-number
+			v-model.trim="formValidate.measureValue"
+			:min="0"
+			:max="99"
+			:step="0.1"
+			step-strictly
+			placeholder="请输入参数"
+			label="参数"
+		  ></el-input-number><span class="from-tips mb5">元</span>
+		</div>
+		<div v-else>
+		   <el-input-number
+			 v-model.trim="formValidate.measureValue"
+			 :min="0"
+			 :max="99"
+			 :step="0.1"
+			 step-strictly
+			 placeholder="请输入参数"
+			 label="参数"
+		   ></el-input-number> <span class="from-tips mb5">元</span>
+		</div>
+	   <!-- <div class="from-tips mb5">优惠措施对应参数值如1，单位输入元。表示优惠1元。</div> -->
 	  </el-form-item>
       <el-form-item label="备注：" prop="remark">
       		  <el-input type="textarea"
@@ -140,6 +155,7 @@ export default {
         if (valid) {
           try {
             this.loadingBtn = true;
+			this.formValidate.unit="元";
             const data = this.formValidate.id == 0
               ? await merchant.merchantMeasuresAddApi(this.formValidate)
               : await merchant.merchantMeasuresUpdateApi(this.formValidate);

mer_mer_admin/src/views/systemSetting/prefernMeasure/default.js

@@ -3,7 +3,9 @@ export const defaultData = {
   isSwitch: false,
   sort: 0,
   measureId: null,
-  unit: '',
+  measureValue: 0,
+  measureValue1: 0,
+  unit: '元',
   isSetting: null,
   remark: null
 };

mer_mer_admin/src/views/systemSetting/prefernMeasure/index.vue

@@ -55,7 +55,7 @@
         type="primary"
         size="small"
         @click="handleCreatPersonnel()"
-        v-hasPermi="['merchant:delivery:personnel:save']"
+        v-hasPermi="['merchant:prefern:measure:add']"
         >新增</el-button
       >
       <el-table v-loading="loading" :data="tableData.data" class="mt20" size="small">
@@ -80,8 +80,13 @@
 			</template>
 		</el-table-column>
 		<el-table-column label="优惠措施" min-width="150" prop="sort">
+			<!-- <template slot-scope="scope" v-if="scope.row.measure==='满减大促'">
+			  {{scope.row.isSetting==true && scope.row.measureValue?scope.row.measure+":"+'满'+scope.row.measureValue+scope.row.unit+'减'+scope.row.measureValue1+scope.row.unit :'无'}}
+			</template> -->
 			<template slot-scope="scope">
-			  {{scope.row.isSetting==true && scope.row.measureValue?scope.row.measure+":"+scope.row.measureValue+scope.row.unit :'无'}}
+			  {{scope.row.isSetting==true && scope.row.measureValue&& scope.row.measure==='满减大促'?scope.row.measure+":"+'满'+scope.row.measureValue1+scope.row.unit+'减'+scope.row.measureValue+scope.row.unit :(scope.row.isSetting==true && scope.row.measureValue?scope.row.measure+":"+scope.row.measureValue+scope.row.unit :'无')}}
+				
+			  <!-- {{scope.row.isSetting==true && scope.row.measureValue?scope.row.measure+":"+scope.row.measureValue+scope.row.unit :'无'}} -->
 			</template>
 		</el-table-column>
         <el-table-column prop="createTime" label="创建时间" min-width="200" />