Merge branch '1.1.19' into test

src/views/system/shop/index.vue

@@ -20,11 +20,8 @@
           <el-form ref="mainForm" :model="mainForm" label-width="180px" class="main-form-con"
                      size="small">
               <el-form-item label="企业类型：" prop="organization_type" inline-message="true">
-                <el-radio-group v-model="mainForm.organization_type" size="mini">
-                  <el-radio :label="2">小规模</el-radio>
-                  <el-radio :label="1">一般纳税人</el-radio>
-                </el-radio-group>
-                <span class="tips-text"><i class="el-icon-warning h-warning"></i>请正确选择企业类型，会影响提现时所需发票的性质。小规模需提供普票，一般纳税人需提供专票</span>
+                <span v-if="mainForm.organization_type==2">小规模</span>
+                <span v-if="mainForm.organization_type==1">一般纳税人</span>
               </el-form-item>
               <el-form-item label="营业执照：" prop="license">
                 <div style="width:100%;height: 100%;display: flex;flex-direction: row;justify-content: normal;">
@@ -258,7 +255,13 @@
     <el-dialog title="编辑店铺信息" :visible.sync="isOpen" width="65%" class="shopinf-edit"
                center :destroy-on-close="true" :close-on-click-modal="false" :before-close="handleCancel">
       <el-form v-if="isOpen" ref="editForm" class="editForm" :model="editForm" :rules="editRules" label-width="180px" size="small">
-
+        <!-- <el-form-item label="企业类型：" prop="organization_type" inline-message="true">
+          <el-radio-group v-model="editForm.organization_type" size="mini">
+            <el-radio :label="2">小规模</el-radio>
+            <el-radio :label="1">一般纳税人</el-radio>
+          </el-radio-group>
+          <span class="tips-text"><i class="el-icon-warning h-warning"></i>请正确选择企业类型，会影响提现时所需发票的性质。小规模需提供普票，一般纳税人需提供专票</span>
+        </el-form-item> -->
         <el-form-item label="电商平台经验：" prop="is_business_experience">
           <el-radio-group v-model="editForm.is_business_experience">
             <el-radio :label="1">有</el-radio>
@@ -461,6 +464,7 @@
         // 编辑
         isOpen: false,
         editForm: {
+          // organization_type:2,
           is_business_experience: '',
           store_name: '',
           scope: [],