huangmp 2 лет назад
Родитель
Сommit
cc8e60a9c9

+ 12 - 14
src/views/modules/prod/prodTemplate-add-or-update.vue

@@ -12,16 +12,15 @@
       </el-form-item>
       <el-form-item label="模板用途" prop="templateUsage">
         <el-select v-model="usageList" clearable filterable multiple>
-          <el-option key="smallcard" label="小卡" value="smallcard"></el-option>
-          <el-option key="squarecard" label="方卡" value="squarecard"></el-option>
-          <el-option key="badge" label="徽章" value="badge"></el-option>
-          <el-option key="postcard" label="明信片" value="postcard"></el-option>
-          <el-option key="bookmark" label="书签" value="bookmark"></el-option>
-          <el-option key="tipscard" label="手幅" value="tipscard"></el-option>
-          <el-option key="polaroid" label="拍立得" value="polaroid"></el-option>
-          <el-option key="covercard" label="直拍封面" value="covercard"></el-option>
-          <el-option key="stub" label="票根" value="stub"></el-option>
-          <el-option key="3CFP" label="3寸花式拍立得" value="3CFP"></el-option>
+          <el-option key="smallcard" label="小卡" value="smallcard,YXK,ZJXK,DBYXK,DBZJXK"></el-option>
+          <el-option key="squarecard" label="方卡" value="squarecard,FK"></el-option>
+          <el-option key="badge" label="徽章" value="badge,HZ"></el-option>
+          <el-option key="postcard" label="明信片" value="postcard,MXP"></el-option>
+          <el-option key="bookmark" label="书签" value="bookmark,SQ"></el-option>
+          <el-option key="tipscard" label="手幅" value="tipscard,SF"></el-option>
+          <el-option key="covercard" label="直拍封面" value="covercard,ZP"></el-option>
+          <el-option key="stub" label="票根" value="stub,PG"></el-option>
+          <el-option key="FP" label="3寸花式拍立得" value="FP,polaroid"></el-option>
           <el-option key="4CFP" label="4寸花式拍立得" value="4CFP"></el-option>
           <el-option key="5CFP" label="5寸花式拍立得" value="5CFP"></el-option>
         </el-select>
@@ -144,15 +143,15 @@ export default {
           }else if(templateUsage.indexOf("postcard") !== -1 || templateUsage.indexOf("MXP") !== -1){
             width = 1229;
             height = 1796;
-          }else if(templateUsage.indexOf("3CFP") !== -1){
-            width = 709;
-            height = 1087;
           }else if(templateUsage.indexOf("4CFP") !== -1){
             width = 921;
             height = 1087;
           }else if(templateUsage.indexOf("5CFP") !== -1){
             width = 1346;
             height = 1087;
+          }else if(templateUsage.indexOf("FP") !== -1){
+            width = 709;
+            height = 1087;
           }
           if(isBack){
             let imageFormat = imageStr.split('.').pop();
@@ -160,7 +159,6 @@ export default {
               reject(index);
             }
           }else if(!isBack && (templateUsage.indexOf("polaroid") !== -1 || templateUsage.indexOf("FP") !== -1)){
-            debugger
             let imageFormat = imageStr.split('.').pop();
             if(imageFormat != 'png'){
               reject(index);

+ 1 - 1
src/views/modules/prod/prodTemplate.vue

@@ -165,7 +165,7 @@ export default {
       resourcesUrl: process.env.VUE_APP_RESOURCES_URL,
       previewPicUrl: null,
       previewPicDialogVisible: false,
-      templateUsageList:[{label:'小卡', value:'YXK'},{label:'3寸拍立得', value:'3CFP'}
+      templateUsageList:[{label:'小卡', value:'YXK'},{label:'3寸拍立得', value:'FP'}
                         ,{label:'4寸拍立得', value:'4CFP'},{label:'5寸拍立得', value:'5CFP'}
                         ,{label:'明信片', value:'MXP'},{label:'票根', value:'PG'},{label:'书签', value:'SQ'}]
     }