代码同步 02.18 -2

src/views/configure/uniTemplate/detail.vue

@@ -26,8 +26,8 @@
               <el-radio v-model="form.showPop" :label="false">不显示</el-radio>
             </el-form-item>
             <el-form-item label="模板类型" prop="templateType">
-              <el-radio v-model="form.templateType" :label="1">标准模板</el-radio>
+              <el-radio v-model="form.templateType" :label="1" @change="handleTemplateTypeChange">标准模板</el-radio>
-              <el-radio v-model="form.templateType" :label="2">定制模板</el-radio>
+              <el-radio v-model="form.templateType" :label="2" @change="handleTemplateTypeChange">定制模板</el-radio>
             </el-form-item>
 
             <!-- 标准模板 -->
@@ -508,6 +508,22 @@
           this.form.templateItemList[index][type] = `${signs}${newValue}`;
         }
       },
+      handleTemplateTypeChange(value) {
+        this.form = {
+          ...this.form,
+          templateItemList: value === 1 ? [] : this.form.templateItemList,
+          bgUrl: undefined,
+          bgWidth: undefined,
+          bgHeight: undefined,
+          showGoodsDetail: true,
+          goodsDetailIconUrl: undefined,
+          showAi: true,
+          aiIconUrl: undefined,
+          showShop: true,
+          shopIconUrl: undefined,
+          changeLanguageIconUrl: undefined,
+        }
+      },
       // 素材弹窗相关
       openSelectMaterial(type) {
         this.selectMaterialVisible = true;

src/views/login.vue

@@ -143,7 +143,7 @@ export default {
 
       LoginRules: {
         username: [
-          {required: true, trigger: "blur", message: "用户名不能为空"}
+          {required: true, trigger: "blur", message: "账号不能为空"}
         ],
         password: [
           {required: true, trigger: "blur", message: "密码不能为空"}

src/views/production/harvestInfo/index.vue

@@ -23,7 +23,7 @@
       </div>
       <!-- 列表 -->
       <el-table v-loading="loading" :data="list">
-        <el-table-column label="编号" align="center" type="index" width="80" >
+        <el-table-column label="序号" align="center" type="index" width="80" >
           <template v-slot="{ $index }">
             <span>{{($index+1)+ (queryParams.pageNo-1)*queryParams.pageSize }}</span>
           </template>
@@ -140,7 +140,7 @@
             <span>{{row.goodsNum}}</span>
           </template>
         </el-table-column>
-        <el-table-column label="单位" align="center" prop="unitName" width="50" />
+        <el-table-column label="商品规格" align="center" prop="goodsSpecs" width="100" />
         <el-table-column v-if="!isWatch" label="说明" align="center" prop="remarks" min-width="160" >
           <template v-slot="{row}">
             <el-input v-model="row.remarks" placeholder="请输入"></el-input>