fix:面料建模

src/config/request/apiList/base.js

+export default {
+	base:{
+		dictionary:{
+			url: "/gdep-system/dict/dictionaryList",
+			method: "post"
+		},
+		sizeGroup:{
+			url: "/gdep-mdm/size/query",
+			method: "post"
+		},
+		getCategoryList:{
+			url: "/gdep-mdm/category/list",
+			method: "get"
+		},
+		getSupplierList:{
+			url: "/gdep-enterprise/supplier/getSupplierList",
+			method: "get"
+		},
+	}
+}
\ No newline at end of file

src/config/request/apis.js

 /**
  * 接口列表文件
  */
+import base from './apiList/base.js'
 import user from './apiList/user.js'
 import auth from './apiList/auth.js'
 import color from './apiList/colors.js'
@@ -18,6 +19,7 @@ import plm from './apiList/plm'
 import mdm from './apiList/mdm'
 
 export default {
+	...base,
 	...user,
 	...auth,
 	...color,

src/config/store/modules/base.js

@@ -166,7 +166,7 @@ const getters = {
 		return filterDictionaryLabelAndKey(fabricWidthUnitArray);
 	},
 	// 开发规则
-	clothWidthUnitArrayDictionary: ({ developmentRulesArray }) => {
+	developmentRulesArrayDictionary: ({ developmentRulesArray }) => {
 		return filterDictionaryLabelAndKey(developmentRulesArray);
 	},
 	// 生产类别

src/pages.json

@@ -30,9 +30,23 @@
       }
     },
     {
-      "path": "pages/webview/index",
+      "path": "pages/home/index",
       "style": {
-        "navigationBarTitleText": "租户选择",
+        "navigationBarTitleText": "首页",
+        "navigationBarTextStyle": "white",
+        "enablePullDownRefresh": false,
+        "navigationStyle": "custom",
+        "mp-alipay": {
+          "transparentTitle": "always",
+          "titlePenetrate": "YES",
+          "allowsBounceVertical": "NO"
+        }
+      }
+    },
+    {
+      "path": "pages/home/components/search",
+      "style": {
+        "navigationBarTitleText": "首页",
         "navigationBarTextStyle": "white",
         "enablePullDownRefresh": false,
         "navigationStyle": "custom",
@@ -43,7 +57,6 @@
         }
       }
     },
-
     {
       "path": "pages/brands/brands",
       "style": {
@@ -58,6 +71,22 @@
         }
       }
     },
+    {
+      "path": "pages/webview/index",
+      "style": {
+        "navigationBarTitleText": "租户选择",
+        "navigationBarTextStyle": "white",
+        "enablePullDownRefresh": false,
+        "navigationStyle": "custom",
+        "mp-alipay": {
+          "transparentTitle": "always",
+          "titlePenetrate": "YES",
+          "allowsBounceVertical": "NO"
+        }
+      }
+    },
+
+
 
     {
       "path": "pages/order/item",
@@ -72,9 +101,9 @@
       "path": "pages/user/center/index",
       "style": {
         "navigationBarTitleText": "用户中心",
-        "navigationBarTextStyle": "white",
+        "navigationBarTextStyle": "black",
         "enablePullDownRefresh": false,
-        "navigationStyle": "custom"
+        "navigationStyle": "default"
       }
     },
     {
@@ -166,6 +195,19 @@
         }
       }
     },
+    {
+      "path": "pages/user/register/completeInformation",
+      "style": {
+        "navigationBarTitleText": "完善信息",
+        //				"navigationBarTextStyle": "white",
+        "enablePullDownRefresh": false,
+        "mp-alipay": {
+          "transparentTitle": "always",
+          "titlePenetrate": "YES",
+          "allowsBounceVertical": "NO"
+        }
+      }
+    },
     {
       "path": "pages/user/register/success",
       "style": {
@@ -313,20 +355,7 @@
         "navigationStyle": "custom"
       }
     },
-    {
-      "path": "pages/home/index",
-      "style": {
-        "navigationBarTitleText": "首页",
-        "navigationBarTextStyle": "white",
-        "enablePullDownRefresh": false,
-        "navigationStyle": "custom",
-        "mp-alipay": {
-          "transparentTitle": "always",
-          "titlePenetrate": "YES",
-          "allowsBounceVertical": "NO"
-        }
-      }
-    },
+
     {
       "path": "pages/home/search",
       "style": {

src/pages/home/tenantSelection.vue

@@ -42,6 +42,7 @@ export default {
 		};
 	},
 	created() {
+	  uni.clearStorageSync();
     this.getTenanList();
 	},
   mounted() {
@@ -140,7 +141,8 @@ export default {
       })
     },
     // 跳转到首页
-    toIndexPage(){
+    async toIndexPage(){
+      await this.$store.dispatch("getCategoryList")
       this.$Router.push({
         path: "/pages/home/index"
       })

src/pages/material/list.vue

@@ -53,7 +53,7 @@
 
 <script>
 import dom from "../designCommissioned/mixins/dom";
-
+import { mapGetters } from 'vuex';
 export default {
   name: "list",
   mixins:[dom],
@@ -70,11 +70,16 @@ export default {
     }
   },
   computed:{
+    ...mapGetters([
+      'categoryDictionary', // 版型
+    ]),
     computedList(){
       return this.list.map((item) => {
         return {
           ...item,
-          materialCategory: item.category,
+          materialCategory: this.categoryDictionary.find(($item) =>{
+            return item.category == $item.value
+          })?.label,
           materialDoorWidth: item.fabricWidth,
           materialElement: item.saoriStandard,
         }

src/pages/modeling/addItem.vue

@@ -293,9 +293,10 @@ export default {
             // reg '^[a-zA-Z\u4e00-\u9fa5][a-zA-Z0-9\u4e00-\u9fa5]*$',
             // 自定义验证函数，见上说明
             validator: (rule, value, callback) => {
-              // 上面有说，返回true表示校验通过，返回false表示不通过
-              // this.$u.test.mobile()就是返回true或者false的
-              let reg = new RegExp('^[\u4e00-\u9fa5][a-zA-Z0-9\u4e00-\u9fa5]*$')
+              // 返回true表示校验通过，返回false表示不通过
+              // fix 2022-02-07 放开特殊符号英文限制 需求 卓总
+              // let reg = new RegExp('^[\u4e00-\u9fa5][a-zA-Z0-9\u4e00-\u9fa5]*$')
+              let reg = new RegExp('^[-()%a-zA-Z\u4e00-\u9fa5][-()%a-zA-Z0-9\u4e00-\u9fa5]*$')
               return reg.test(value);
             },
             message: '请不要输入特殊符号',

src/pages/modeling/item.vue

@@ -375,7 +375,7 @@
             </view>
           </view>
           <view class="custom-style-round-circle custom-style-btn custom-style"
-                v-if="detail.status === 3 || detail.status === 2">
+                v-if="[1,2].indexOf(detail.oddStatus) > -1 || detail.status === 3 || detail.status === 2" >
 <!--            <view class="custom-style-left save" @click="cancel(3)">撤回</view>-->
             <view class="custom-style-right submit" @click="cancel">
               <view class="title">撤回</view>
@@ -448,8 +448,9 @@ export default {
             // 自定义验证函数，见上说明
             validator: (rule, value, callback) => {
               // 上面有说，返回true表示校验通过，返回false表示不通过
-              // this.$u.test.mobile()就是返回true或者false的
-              let reg = new RegExp('^[\u4e00-\u9fa5][a-zA-Z0-9\u4e00-\u9fa5]*$')
+              // fix 2022-02-07 放开特殊符号英文限制 需求 卓总
+              // let reg = new RegExp('^[\u4e00-\u9fa5][a-zA-Z0-9\u4e00-\u9fa5]*$')
+              let reg = new RegExp('^[-()%a-zA-Z\u4e00-\u9fa5][-()%a-zA-Z0-9\u4e00-\u9fa5]*$')
               return reg.test(value);
             },
             message: '请不要输入特殊符号',
@@ -581,12 +582,15 @@ export default {
   },
   onLoad({id}){
     if(id){
-      this.getDetail(id)
+      this.id = id;
     }
   },
   mounted() {
     this.$refs.uForm.setRules(this.rules);
   },
+  onShow() {
+    this.getDetail(this.id)
+  },
   methods:{
     confirm(data){
       let { value, label} = data[0];
@@ -759,6 +763,7 @@ export default {
                 id: info.id,
                 courierText: (this.courierList.find((item) => item.value == info.courier) || { label: ''}).label
               }
+              this.getFooterHeight();
             }
           })
     },

src/pages/modeling/tags.vue

@@ -156,10 +156,10 @@ export default {
     triggerClick(item){
       let list = this.detail.modelingTaskLabelList;
       let $Item = list.find(($i) => $i.materialLabelId === item.materialLabelId);
-      // debugger
+
       if($Item){
         if($Item.id){
-          this.$set($Item,'isDeleted',true)
+          this.$set($Item,'isDeleted', !$Item.isDeleted)
         }else{
           let index = this.detail.modelingTaskLabelList.findIndex(($v) => $v === $Item)
           if(index > -1){

src/pages/user/center/index.vue

@@ -10,6 +10,7 @@
         <view class="u-font-32 u-m-b-8 u-line-1">{{msg.fullName}}</view>
         <view class="u-font-24">{{msg.userName}}</view>
       </view>
+      <view @click="toBrowse" class="u-l-height-44" v-if="type === 2">浏览记录</view>
       <view @click="toRegister" class="u-l-height-44">切换身份</view>
     </view>
 
@@ -25,7 +26,8 @@ export default {
   components: {HsTabBar},
   data(){
     return{
-      msg: uni.getStorageSync("userInfo")
+      msg: uni.getStorageSync("userInfo"),
+      type: uni.getStorageSync("assignType")
     }
   },
   created() {
@@ -34,20 +36,24 @@ export default {
   },
   methods:{
     edit(){
-      let type = uni.getStorageSync("assignType");
       this.$Router.push({
         path: '/pages/user/register/completeInformation',
         query:{
-          type
+          type: this.type
         }
       })
     },
+    toBrowse(){
+
+      this.$Router.push({
+        path: '/pages/brands/browse'
+      })
+    },
     toRegister(){
-      let type = uni.getStorageSync("assignType");
       this.$Router.push({
         path: '/pages/user/register/stepSelectType',
         query:{
-          type
+          type: this.type
         }
       })
     }
@@ -60,7 +66,7 @@ export default {
 .item{
   padding: 36rpx 30px;
   height: 160rpx;
-  background: url(~@/static/images/home/exhibition.png) no-repeat;
+  background: url(~@/static/images/myCenter/bg.png) no-repeat;
   background-size: 100% 100%;
   margin-bottom: 20rpx;
   color: #fff;

src/pages/user/register/mixins/goIndex.js

 export default {
     methods:{
         // 注册成功 跳转到首页
-        goIndex(){
+        async goIndex(){
             uni.setStorageSync('assignType', this.assignType)
+            await this.$store.dispatch("getCategoryList")
             if(this.assignType !== 2){
                 this.$Router.replace({
                     path: '/pages/home/index'

src/pages/webview/index.vue

@@ -46,10 +46,10 @@ export default {
               title: msg
             })
           }
-        })
-           .complete(() =>{
-              this.loading = false;
-           })
+        }).then(res =>{
+         this.loading = false;
+       })
+
     }
   },
   created() {