1、AR发行配置

src/components/AudioBox/index.vue

@@ -506,9 +506,9 @@ export default {
      * @returns {boolean}
      */
     beforeUploadVideo (file) {
-      const isLt5M = file.size / 1024 / 1024 < 5
-      if (!isLt5M) {
-        this.$message.error('上传音频大小不能超过5MB哦!')
+      const isLt30M = file.size / 1024 / 1024 < 30
+      if (!isLt30M) {
+        this.$message.error('上传音频大小不能超过30MB哦!')
         return false
       }
       return true
@@ -526,7 +526,7 @@ export default {
     },
 
     uploadSizeTip () {
-      return this.$i18n.t('videoManager.notExceed') + '5M'
+      return this.$i18n.t('videoManager.notExceed') + '30M'
     },
 
     uploadTips () {

src/views/modules/ar/arIssue/index.vue

@@ -11,6 +11,12 @@
             row-class-name="table-row-low"
             style="width: 100%"
           >
+            <el-table-column
+              label="发行ID"
+              prop="issueId"
+              align="center"
+            >
+            </el-table-column>
             <el-table-column
               label="发行名称"
               prop="issueName"

src/views/modules/ar/arIssueConfig/add-or-update.vue

@@ -84,7 +84,8 @@ export default {
         assetsType: 'Video',
         assetsPackage: null,
         assetsIdList:[],
-        screenOrientation: 'portrait'
+        screenOrientation: 'portrait',
+        shopId: this.$store.state.user.shopId,
       },
       arCodeConfig:{
         configId: null,
@@ -159,23 +160,24 @@ export default {
       })
     },
     handleIssue(){
-      this.$confirm('确定要生成卡片吗？', '提示', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
-        type: 'warning'
+      this.$http({
+        url: this.$http.adornUrl('/ar/arIssuePicAssetsConfig/issue'),
+        method: 'post',
+        data: this.$http.adornData(this.arCodeConfig)
       }).then(() => {
-        this.$http({
-          url: this.$http.adornUrl('/ar/arIssuePicAssetsConfig/issue'),
-          method: 'post',
-          data: this.$http.adornData(this.arCodeConfig)
-        }).then(() => {
-          this.$message({
-            message: '请刷新查看发行进度',
-            type: 'success'
-          });
-          this.closeDialog()
-        })
+        this.$message({
+          message: '请刷新查看发行进度',
+          type: 'success'
+        });
+        // this.closeDialog()
       })
+      // this.$confirm('确定要生成卡片吗？', '提示', {
+      //   confirmButtonText: '确定',
+      //   cancelButtonText: '取消',
+      //   type: 'warning'
+      // }).then(() => {
+      //
+      // })
     },
     closeDialog(){
       this.visible = false;

src/views/modules/ar/arIssuePic/add-or-update.vue

@@ -147,7 +147,8 @@ export default {
         frontList: [],
         picType: "6x9",
         back: {},
-        issuePicLevel: null
+        issuePicLevel: null,
+        shopId: this.$store.state.user.shopId
       },
       lang: localStorage.getItem('lang'),
       page: {
@@ -169,6 +170,7 @@ export default {
       frontUploadErrorTips: '',
       backUploadErrorTips: '',
       resourcesUrl: process.env.VUE_APP_RESOURCES_URL,
+      shopId: this.$store.state.user.shopId,
     }
   },
   created () {
@@ -304,8 +306,8 @@ export default {
         width = 1252
         height = 1819
       }else if (picType === 'D3CXK') {
-        width = 803
-        height = 1098
+        width = 815
+        height = 1110
       }else{
         width = 780
         height = 1134

src/views/modules/ar/arIssuePic/index.vue

@@ -17,6 +17,12 @@
             row-class-name="table-row-low"
             style="width: 100%"
           >
+            <el-table-column
+              label="图片ID"
+              prop="issuePicId"
+              align="center"
+            >
+            </el-table-column>
             <el-table-column
               label="图片名称"
               prop="issuePicName"

src/views/modules/resource/audio-store/upload-audio.vue

@@ -233,9 +233,9 @@ export default {
     },
     // 音频预上传
     onUploadChange (file, fileList) {
-      const isLt5M = file.size / 1024 / 1024 < 5
-      if (!isLt5M) {
-        this.$newMessage.error('上传音频大小不能超过5MB!')
+      const isLt = file.size / 1024 / 1024 < 30
+      if (!isLt30M) {
+        this.$newMessage.error('上传音频大小不能超过30MB!')
         return
       }
       let extend = file.raw.name.split(".")[1]
@@ -271,8 +271,8 @@ export default {
      * @returns {boolean}
      */
     beforeUploadVideo (file) {
-      const isLt5M = file.size / 1024 / 1024 < 5
-      return isLt5M
+      const isLt30M = file.size / 1024 / 1024 < 30
+      return isLt30M
     },
 
     uploadNumberLimit () {

src/views/modules/shop/feature/create/edit/components/image_ad/index.vue

@@ -53,6 +53,27 @@
                 </div>
               </div>
             </div>
+            <el-form ref="formData"
+                     class="ad-form"
+                     label-width="100px"
+                     v-if="formData.indicator === 1">
+              <el-form-item label="图片左边距">
+                <el-input type="number" v-model="formData.paddingLeft"></el-input>
+              </el-form-item>
+              <el-form-item label="图片右边距">
+                <el-input type="number" v-model="formData.paddingRight"></el-input>
+              </el-form-item>
+              <el-form-item label="图片下边距">
+                <el-input type="number" v-model="formData.imageBottom"></el-input>
+              </el-form-item>
+              <el-form-item label="登录后隐藏">
+                <el-switch v-model="formData.hideAfterLogin"
+                           active-color="#13ce66"
+                           inactive-color="#ff4949">
+                </el-switch>
+              </el-form-item>
+            </el-form>
+
             <el-form ref="formData"
                     class="ad-form"
                     label-width="100px"
@@ -246,6 +267,10 @@ export default {
       currentEditIndex: 0, // 当前编辑的图片
       currentHotEditIndex: 0, // 当前编辑的热区
       formData: {
+        paddingLeft: 0,
+        paddingRight: 0,
+        imageBottom: 0,
+        hideAfterLogin: false,
         indicator: 1, // 选择模板: 1一行一个; 2轮播海报; 3横向滑动; 4热区
         imageList: [], // 图片列表
         swiperOption: {  // 轮播海报设置

src/views/modules/shop/feature/create/edit/components/scroll-tab-nav/index.vue

@@ -62,6 +62,11 @@
           <!-- 配置-->
           <div class="tab-set-box">
             <el-form ref="formData" class="edit-form" size="small">
+              <el-switch v-model="formData.normal"
+                         active-color="#13ce66"
+                         inactive-color="#ff4949">
+              </el-switch>
+              <el-input type="number" v-model="formData.imageWidth" placeholder="图片宽度"></el-input>
               <el-form-item label="选择背景">
                 <div @click="changeImgType(1)">
                   <img-upload v-model="formData.bgImg" v-if="!formData.bgImg" @input="changeImg"></img-upload>
@@ -369,7 +374,8 @@ export default {
         duration:0,
         interfaceMode: "manual",
         interfaceApi: "",
-        dataSize: 10
+        dataSize: 10,
+        imageWidth:0
       },
       setCountsList: [
         {