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

src/pages/home/detail.vue

@@ -4,7 +4,7 @@
     <view class="back" :style="topHeight==0?'':{'padding-top':resultpx}">
      <!-- <view class="back"> -->
       <view class="u-flex">
-        <u-navbar :is-back="true" :background="{ backgroundColor: '#F5F5F5' }" title="面料详情">
+        <u-navbar :is-back="true" :custom-back="backPush" :background="{ backgroundColor: '#F5F5F5' }" title="面料详情">
           <template v-slot:right>
             <view class="nav-nav" @click="edit()">编辑</view>
           </template>
@@ -177,6 +177,14 @@
             id: this.id
           }
         })
+      },
+      backPush(){
+        this.$Router.push({
+          path: "/pages/home/fabricList",
+          // query: {
+          //   id: this.id
+          // }
+        })
       }
     }
   }

src/pages/home/editFabric.vue

@@ -76,14 +76,25 @@
                         data
                     } = res;
                     if (code === 200) {
-                        this.$router.push({
-                            path: "/pages/home/detail",
-                            query: {
-                                id: this.id
-                            }
-                        })
+                        uni.showToast({
+                            title: '操作成功',
+                            // icon: 'none'
+                            // duration: 2000
+                        });
+                        setTimeout(() => {
+                            this.$Router.push({
+                                path: "/pages/home/detail",
+                                query: {
+                                    id: this.id
+                                }
+                            })
+                        }, 1000)
                     } else {
-
+                        uni.showToast({
+                            title: '操作失败',
+                            icon: 'none'
+                            // duration: 2000
+                        });
                     }
                 });
             }

src/pages/home/fabricList.vue

 <template>
 	<view class="">
-		<u-navbar :is-back="true" :background="{ backgroundColor: '#F5F5F5' }" title="我的面料"></u-navbar>
+		<u-navbar :is-back="true" :custom-back="backPush" :background="{ backgroundColor: '#F5F5F5' }" title="我的面料"></u-navbar>
 		<view class="content background_fff u-p-30">
 			<!-- 正文内容 -->
 			<u-sticky offset-top="15">
@@ -47,6 +47,7 @@ export default {
 	},
 	// 上拉加载更多
 	onReachBottom() {
+		// console,log("jiazai")
 		if (this.total > this.fiabricList.length) {
 			this.size = this.size + 5;
 			this.materialList();
@@ -83,7 +84,15 @@ export default {
 					this.total = data.page.total;
 				}
 			});
-		}
+		},
+		backPush(){
+        this.$Router.push({
+          path: "/pages/home/index",
+          // query: {
+          //   id: this.id
+          // }
+        })
+      }
 	}
 };
 </script>