Merge branch 'dev' of http://47.110.145.204:8085/lixingjian/hs-app-project into dev

src/pages/home/components/fabricTitle.vue

 <template>
 	<view>
-		<view class="home_con_content_order u-m-t-30" v-for="item,index in tableData" @click="goDetail(item)"
+		<view class="home_con_content_order u-m-t-30" v-for="(item,index) in tableData" @click="goDetail(item)"
 			:key="index">
 			<image style="width: 100%;height: 160rpx;" src="../../../static/images/home/1@2x.png" mode=""></image>
 			<view class="order_tit">
@@ -11,7 +11,7 @@
 					</span>
 				</view>
 				<view class="u-font-24 u-m-t-20 color_6F6F72">
-					<span v-for="itemMater,indexMater in dataList" :key="indexMater"> <span class="u-m-r-10" 
+					<span v-for="itemMater in dataList" :key="indexMater"> <span class="u-m-r-10"
 							v-if="itemMater.id==item.category"> {{itemMater.name}}</span></span>
 					|
 					<span class="u-m-l-10 u-m-r-10">{{item.clothWidth}}cm</span>
@@ -51,8 +51,8 @@
 		},
 		methods: {
 			goDetail(item) {
-				console.log(333)
-				this.$router.push({
+				// console.log(333)
+				this.$Router.push({
 					path: "/pages/home/detail",
 					query: {
 						id: item.id
@@ -100,4 +100,4 @@
 	.color_6F6F72 {
 		color: #6f6f72;
 	}
-</style>
\ No newline at end of file
+</style>

src/pages/home/detail.vue

@@ -2,9 +2,11 @@
   <view class="whole">
 
     <view class="back">
-      <view style="display:flex">
+      <view class="u-flex">
         <u-navbar :is-back="true" :background="{ backgroundColor: '#F5F5F5' }" title="面料详情">
-          <view class="nav-nav" @click="edit()">编辑</view>
+          <template v-slot:right>
+            <view class="nav-nav" @click="edit()">编辑</view>
+          </template>
 
         </u-navbar>
       </view>
@@ -137,7 +139,7 @@
         });
       },
       edit() {
-        this.$router.push({
+        this.$Router.push({
           path: "/pages/home/editFabric",
           query: {
             id: this.id

src/pages/material/createMaterial.vue

@@ -425,17 +425,20 @@ export default {
     this.$nextTick(async ()=>{
       await this.getItem(this.id);
       let canvas = this.$refs.eCanvas;
+      let BASE_URL = this.getBaseUrl();
       await canvas.init({
         canvas_id: "eCanvas",
         canvas_width: 375,
         canvas_height: 375,
+        path: `${BASE_URL}${this.detail.originalImageCode}`
       })
       await this.$refs['eCanvasHelp'].init({
         canvas_id: "eCanvasHelp",
         canvas_width: 375,
         canvas_height: 375,
+        path: `${BASE_URL}${this.detail.originalImageCode}`
       })
-      let BASE_URL = this.getBaseUrl();
+
       let sources = [`${BASE_URL}${this.detail.originalImageCode}`].concat(
           this.parts.map((item) => `${BASE_URL}${item.pictureCode}`)
       );
@@ -611,7 +614,7 @@ export default {
               this.toggleCanvasEditCallback
           );
         }
-        this.isEdit = false;
+        // this.isEdit = false;
       } else {
         if(this.activeColor.colourId){
           this.ontherPartTrigger(
@@ -660,7 +663,6 @@ export default {
       })
       let base64 = await this.$refs['eCanvas'].exportImg();
       let res = await this.uploadImg(base64);
-      // console.log(data)
       // return;
       this.$http("stylelibraryorder.addToShelves", Object.assign({},data,{fileCode: res.fileCode})).then((res) => {
         let { code, msg } = res;

src/pages/material/entrustManagement.vue

@@ -283,7 +283,10 @@ export default {
       }
     }
   },
-  created() {
+  // created() {
+  //   this.getList();
+  // },
+  onShow(){
     this.getList();
   },
   methods:{

src/pages/material/selectType.vue

@@ -39,16 +39,18 @@
               class="u-flex u-m-b-20">
           <view class="item item--round u-flex ">
             <view class="item-img u-relative">
-              <image :src="`${$IMG_URL}${item.effectPictureCode}`" mode="fit" style="width:100%; height: 100%"></image>
+              <image :src="`${$IMG_URL}${item.effectPictureCode}`"
+                     mode="fit"
+                     style="width:100%; height: 100%"></image>
               <u-image width="100rpx" height="100rpx" v-if="item.putawayStatus === 1"
                        class="item--status"
                        mode="widthFix"
                        src="@/static/images/material/status.png">
               </u-image>
             </view>
-            <view class="u-flex-1 u-p-l-20 u-p-r-30 u-border-left">
+            <view class="u-p-l-20 u-p-r-30 u-border-left item-content">
               <view class="item-title u-flex ">
-                <view class="u-flex-1 u-line-1 u-font-32 u-p-t-20 u-p-b-8">{{item.category}}</view>
+                <view class="u-flex-1 u-line-1 u-font-32 u-p-t-20 u-p-b-8">{{item.styleTag}}</view>
                 <u-icon size="24" color="#000" name="arrow-right"></u-icon>
               </view>
               <view class="item-desc u-font-24">{{ item.styleCode }}</view>
@@ -340,6 +342,9 @@ $main-color: #fff;
     height: 150rpx;
     //height: 100%
   }
+  &-content{
+    width: calc(100% - 160rpx)
+  }
   &-title{}
   &-desc{}
   &-tags{