代码同步 02.20

src/views/identity/setting/codeDetail.vue

@@ -103,7 +103,9 @@
     data() {
       return{
         info: {},
-        identify: {},
+        identify: {
+          mobileSystemInfo: {},
+        },
         queryParams: {
           pageNo: 1,
           pageSize: 10,
@@ -124,20 +126,22 @@
       async getDate(id) {
         let res = await getCode(id);
         this.info = res.data;
-        this.identify = {};
+        this.identify = {
+          mobileSystemInfo: {},
+        };
         if (res.data) {
           const { data: brandTypeData } = await getDictDataListByTypeList({ typeList: "brand_type" });
           this.brandTypeList = brandTypeData;
 
           getFirstScanInfoByUrlAndNumber({ identityUrl: res.data.identityCode }).then(async ({ data }) => {
-            if(data) {
+            if (data) {
               this.identify = data;
               const brandSet = new Set();
               const modelMap = {};
 
               data.mobileSystemInfo = JSON.parse(data.mobileSystemInfo);
               if (data.mobileSystemInfo.type == "h5") {
-                if (data.mobileSystemInfo.brand != "UnknownTablet") {
+                if (data.mobileSystemInfo.brand != "UnknownTablet" && data.mobileSystemInfo.brand != null) {
                   brandSet.add(data.mobileSystemInfo.brand);
                 }
               }
@@ -146,7 +150,7 @@
               const sacnPageList = resf.data.map(item => {
                 item.mobileSystemInfo = JSON.parse(item.mobileSystemInfo);
                 if (item.mobileSystemInfo.type == "h5") {
-                  if (item.mobileSystemInfo.brand != "UnknownTablet") {
+                  if (item.mobileSystemInfo.brand != "UnknownTablet" && data.mobileSystemInfo.brand != null) {
                     brandSet.add(item.mobileSystemInfo.brand);
                   }
                 }
@@ -157,6 +161,7 @@
                 for (let brand of brandSet) {
                   modelMap[brand] = [];
                 }
+                console.log(brandSet, modelMap);
                 // 请求品牌对应的手机型号
                 const { data: dictData } = await getDictDataListByTypeList({ typeList: [...brandSet].join(",") });
                 dictData.map(dict => {

src/views/production/setting/miniProConfig.vue

@@ -40,8 +40,8 @@
         </div>
       </div>
       <div class="setting-title flex-jcenter">
-        <div class="mr-6">
+        <div class="mr-6 title-left">
-          <el-input v-model="goodsInfo.linkName" />
+          <span>标题: </span><el-input v-model="goodsInfo.linkName" />
         </div>
         <div>
           <span class="fs-12 mr-6" >扫码展示</span>
@@ -115,7 +115,8 @@
         <el-collapse-item v-for="(item, index) in inspections" :key="index" :name="index">
           <template #title>
             <div class="info-setting-title">
-              <span style="display: flex; width: 190px;">
+              <span style="display: flex; width: 190px;" class="title-left">
+                <span>标题: </span>
                 <el-input v-model="item.linkName" @click.native.stop=""  />
               </span>
               <div style="display: flex;align-items: center;">
@@ -201,7 +202,8 @@
         <el-collapse-item v-for="(item, index) in linkInfos" :key="index" :name="index">
           <template #title>
             <div class="info-setting-title">
-              <span style="display: flex; width: 190px;">
+              <span style="display: flex; width: 240px;" class="title-left">
+                <span>标题: </span>
                 <el-input v-model="item.linkName" @click.native.stop=""  />
               </span>
               <div style="display: flex;align-items: center; margin-right: 10px;">
@@ -244,7 +246,8 @@
         </div>
       </div>
       <div class="setting-title flex-jcenter" v-if="businessInfo">
-        <div class="mr-6">
+        <div class="mr-6 title-left">
+          <span>标题: </span>
           <el-input v-model="businessInfo.linkName" />
         </div>
         <div>
@@ -1519,7 +1522,7 @@
 
         let businessInfo = null;
         if (this.businessInfo) {
-            businessInfo = {
+          businessInfo = {
             ...this.businessInfo,
             operateDetails: this.businessInfo.operateDetails?.filter(item => item.type !== '').map((item, index) => {
               if(item.type == 7 || item.type == 10 || item.type == 14 || item.type == 15){//地图
@@ -1529,6 +1532,15 @@
               return item;
             }),
           }
+
+          if (!businessInfo.linkName) {
+            this.$message.error('企业信息标题不能为空');
+            return false;
+          }
+          if(!businessInfo.operateDetails || businessInfo.operateDetails.length === 0){
+            this.$message.error('企业信息不能为空');
+            return false;
+          }
         }
 
         const linkInfos = this.linkInfos.map(link => {
@@ -1544,7 +1556,11 @@
           }
         });
 
-        if(!goodsInfo.linkName || !goodsInfo.operateDetails || goodsInfo.operateDetails.length === 0){
+        if (!goodsInfo.linkName) {
+          this.$message.error('商品信息标题不能为空');
+          return false;
+        }
+        if(!goodsInfo.operateDetails || goodsInfo.operateDetails.length === 0){
           this.$message.error('商品信息不能为空');
           return false;
         }
@@ -1627,4 +1643,13 @@
 </script>
 
 <style>
+.setting-main {
+}
+.title-left {
+  display: flex;
+  align-items: center;
+}
+.title-left > span {
+  width: 50px;
+}
 </style>