页面修改

src/components/CommodityMan/goodsListEdit.vue

@@ -155,12 +155,12 @@
                       :inactive-value="2">
                     </el-switch>
                   </el-form-item>
-                  <el-form-item label="自动上架时间" style="display:none;">
+                  <el-form-item label="自动上架时间"  >
                     <el-date-picker size="small" v-model="addMsg.ShelvesDate" default-time="12:00:00" value-format="yyyy-MM-dd HH:mm:ss"
                       type="datetime" placeholder="选择日期时间">
                     </el-date-picker>
                   </el-form-item>
-                  <el-form-item label="自动下架时间" style="display:none;">
+                  <el-form-item label="自动下架时间"  >
                     <el-date-picker size="small" v-model="addMsg.DownDate" default-time="12:00:00" value-format="yyyy-MM-dd HH:mm:ss"
                       type="datetime" placeholder="选择日期时间">
                     </el-date-picker>

src/components/StoreDesign/liveConfig.vue

@@ -150,18 +150,15 @@
             if (jsonData) {
               this.ShareMsg.Id = jsonData.Id;
               this.ShareMsg.LiveBgImg = jsonData.LiveBgImg;
-              this.ShareMsg.IsShowQrCode = jsonData.IsShowQrCode;
               this.ShareMsg.LiveQrCodePaddingTop = jsonData.LiveQrCodePaddingTop;
               this.ShareMsg.LiveQrCodePaddingLeft = jsonData.LiveQrCodePaddingLeft;
               this.ShareMsg.LiveQrCodeSize = jsonData.LiveQrCodeSize;
               this.ShareMsg.LiveQrCodeType = jsonData.LiveQrCodeType;
             } else {
               this.ShareMsg.LiveBgImg = this.sharePosterDefaultImg;
-              this.ShareMsg.IsShowQrCode = 0;
-              this.ShareMsg.LiveQrCodeSize = 162;
-              this.ShareMsg.LiveQrCodePaddingTop = 1022;
-              this.ShareMsg.LiveQrCodePaddingLeft = 76;
-              this.ShareMsg.LiveQrCodeSize = 162;
+              this.ShareMsg.LiveQrCodePaddingTop = 1182;
+              this.ShareMsg.LiveQrCodePaddingLeft = 585;
+              this.ShareMsg.LiveQrCodeSize = 140;
               this.ShareMsg.LiveQrCodeType = 0;
             }
           } else {

src/components/UserMan/fxDistribution.vue

@@ -24,6 +24,14 @@
         </el-table-column>
         <el-table-column prop="Grade" label="等级">
         </el-table-column>
+        <el-table-column prop="Icon" label="图标">
+          <template slot-scope="scope">
+            <div class="zk_pic_box" flex="main:center cross:center" style="width:32px;height:32px;"
+              :style="{backgroundImage:'url(' + getIconLink(scope.row.Icon) + ')'}">
+              <i v-if="scope.row.Icon==''" class="el-icon-picture-outline"></i>
+            </div>
+          </template>
+        </el-table-column>
         <el-table-column prop="GradeName" label="等级名称">
         </el-table-column>
         <el-table-column prop="IsGuest" label="会员类型">
@@ -198,6 +206,15 @@
             </el-form-item>
           </el-col>
           <el-col :span="12">
+            <el-form-item label="图标">
+              <el-tooltip class="item" effect="dark" content="建议尺寸:32*32" placement="top">
+                <el-button size="mini" @click="choicImg=true">选择图片</el-button>
+              </el-tooltip>
+              <div class="zk_pic_box" flex="main:center cross:center" style="width:32px;height:32px;"
+                :style="{backgroundImage:'url(' + getIconLink(addMsg.Icon) + ')'}">
+                <i v-if="addMsg.Icon==''" class="el-icon-picture-outline"></i>
+              </div>
+            </el-form-item>
           </el-col>
         </el-row>
         <el-row>
@@ -227,9 +244,14 @@
         <el-button size="small" type="primary" @click="viewdialog = false">关闭</el-button>
       </span>
     </el-dialog>
+    <!-- 选择图片文件 -->
+    <el-dialog title="选择文件" :visible.sync="choicImg" width="1240px">
+      <ChooseImg @SelectId="SelectId"></ChooseImg>
+    </el-dialog>
   </div>
 </template>
 <script>
+  import ChooseImg from "@/components/global/ChooseImg.vue";
   export default {
     data() {
       return {
@@ -259,9 +281,10 @@
           IsUpgrade: 1, //是否可以升级 1是 2否
           UpgradeNum: 0, //升级所需下级等级数量
           UpgradeId: 1, //升序所需下级等级id
-          DecimalType:1, //小数类型 
-          Description:'', //描述
-          Year:1 //年份
+          DecimalType: 1, //小数类型 
+          Description: '', //描述
+          Year: 1, //年份
+          Icon: "", //图标
         },
         //分销商选择等级
         numList: [],
@@ -285,9 +308,13 @@
           }],
         },
         //预览数据
-        viewData: []
+        viewData: [],
+        choicImg: false, //选择图片
       };
     },
+    components: {
+      ChooseImg,
+    },
     created() {
       this.numList = []
       for (let i = 1; i < 11; i++) {
@@ -307,10 +334,10 @@
             this.total = res.data.data.count;
             let pageData = res.data.data.pageData;
             this.tableData = pageData;
-            this.numList.forEach(item=>{
-              this.tableData.forEach(val=>{
-                if(item.Id==val.Id){
-                  item.dis=true;
+            this.numList.forEach(item => {
+              this.tableData.forEach(val => {
+                if (item.Id == val.Id) {
+                  item.dis = true;
                 }
               })
             })
@@ -344,9 +371,9 @@
           IsUpgrade: 2, //是否可以升级 1是 2否
           UpgradeNum: 0, //升级所需下级等级数量
           UpgradeId: 1, //升序所需下级等级id
-          DecimalType:1, //小数类型 
-          Description:'', //描述
-          Year:1 //年份
+          DecimalType: 1, //小数类型 
+          Description: '', //描述
+          Year: 1 //年份
         }
       },
       //修改
@@ -399,7 +426,7 @@
       },
       //预览
       getView() {
-        this.viewdialog=true;
+        this.viewdialog = true;
         this.apipost("/api/user/GetFXDistributorGradeView", {}, res => {
           if (res.data.resultCode == 1) {
             this.viewData = res.data.data;
@@ -407,8 +434,12 @@
             this.Error(res.data.message);
           }
         })
-
-      }
+      },
+      //选择图片
+      SelectId(msg) {
+        this.addMsg.Icon = this.getIconLink(msg.url);
+        this.choicImg = false;
+      },
     },
     mounted() {
       this.getList();