shish 4 lat temu
rodzic
commit
93a3257806

+ 4 - 7
ghsApp/src/admin/breakage/result.vue

@@ -1,6 +1,6 @@
 <template>
   <appResult title="报损成功">
-	<button class="admin-button-com big" @click="goBack">返回</button>
+	<button class="admin-button-com big" @click="goBack">返回首页</button>
   </appResult>
 </template>
 <script>
@@ -17,12 +17,9 @@ export default {
   },
   methods: {
     goBack() {
-      this.$util.pageTo({
-        url: "/admin/breakage/list",
-        type: 3
-      });
-    },
-  },
+      this.$util.pageTo({ url: "/admin/home/workbench", type: 3, query: { tabIndex: 0 }})
+    }
+  }
 };
 </script>
 

+ 2 - 0
ghsApp/src/admin/shop/add.vue

@@ -7,10 +7,12 @@
 					<div class="tui-title required">门店名称</div>
 					<input v-model="form.shopName" placeholder-class="phcolor" class="tui-input" name="shopName" placeholder="请输入名称,如同安店" maxlength="50" type="text" />
 				</tui-list-cell>
+<!--
 			<tui-list-cell class="line-cell" :hover="false">
 			<div class="tui-title required" >门店图片</div>
 			<app-uploader :remark="'建议上传比例750X480'" @chooseImage="_resultData" :num="4" :prefixShow="true" :imgList="form.img"/>
 			</tui-list-cell>
+-->
 			</div>
 			<!-- <div class="prompt-text">注: 请先关注公众号,绑定后可以在移动端自动登录</div> -->
 			<!-- 登录信息 -->

+ 13 - 5
ghsApp/src/pagesStorehouse/inventory/select.vue

@@ -61,7 +61,7 @@
 			</template>
 		</modal-module>
 
-		<modal-module :show="showSubmitModel" @cancel="cancelEvent" @click="submitEvent" :title="confirmContent" color="#333" :size="32" padding="30upx 30upx" >
+		<modal-module :show="showSubmitModel" @cancel="cancelEvent" @click="submitEvent" title="确认下一步?" color="#333" :size="32" padding="30upx 30upx" >
 		</modal-module>
 
 		<FooterCart :offPrice="true" :price="allPrice" :count="allCount" @confirm="confirmToSaveItem"></FooterCart>
@@ -108,10 +108,7 @@ export default {
 		};
 	},
 	computed: {
-		confirmContent() {
-			let content = "确认下一步?";
-			return content;
-		}
+
 	},
 	computed:{
 		...mapGetters(["getMyShopInfo","getLoginInfo"]),
@@ -128,6 +125,17 @@ export default {
 			}
 			this.submitEvent(1)
 		},
+		submitEvent(val) {
+			if (val.index === 0) {
+				this.cancelEvent()
+			} else {
+				uni.navigateBack({ delta: 1 })
+				this.cancelEvent()
+			}
+		},
+		cancelEvent() {
+			this.showSubmitModel = false;
+		},
 		change(e) {
 			if (this.tabIndex == e.index) {
 				return false;