feat:xinz

manifest.json

@@ -1,6 +1,6 @@
 {
-    "name" : "yhc-merchantapplet",
-    "appid" : "__UNI__A3ABAAD",
+    "name" : "yhc-merchantapplet1",
+    "appid" : "__UNI__3E9B1DB",
     "description" : "",
     "versionName" : "1.0.0",
     "versionCode" : 309,
@@ -101,7 +101,7 @@
                 // }
                 // 自行修改下方的 /api
                 "/api" : {
-                    "target" : "服务器地址",
+                    "target" : "https://api.hxxfb.com",
                     "pathRewirte" : {
                         //路径重写
                         "^/api" : "/"

pages.json

@@ -1,49 +1,63 @@
 {
     "pages" : [
-        //pages数组中第一项表示应用启动页，参考：https://uniapp.dcloud.io/collocation/pages
-		{
-		    "path" : "pages/my/index",
-		    "style" : {
-		        // "navigationBarTitleText": "服务中心"
-		        "navigationStyle" : "custom"
-		    }
-		},
-        {
-            "path" : "pages/index/index",
-            "style" : {
-                "navigationBarTitleText" : "启动"
-            }
-        },
-        // "navigationBarBackgroundColor": "#FFFF"
-        {
-            "path" : "pages/index/bottombat",
-            "style" : {
-                "navigationBarTitleText" : ""
-            }
-        },
-        // "navigationBarBackgroundColor": "#FFFF"
-        {
-            "path" : "pages/cashier/index",
-            "style" : {
-                // "navigationBarTitleText": "收银台",
-                "navigationStyle" : "custom",
-                "enablePullDownRefresh" : true
-            }
-        },
-        {
-            "path" : "pages/storemanagement/index",
-            "style" : {
-                "navigationBarTitleText": ""
-            }
-        },
-        {
-            "path" : "pages/ordermanagement/index",
-            "style" : {
-                // "navigationBarTitleText": "订单管理"
-                "navigationStyle" : "custom"
-            }
+      //pages数组中第一项表示应用启动页，参考：https://uniapp.dcloud.io/collocation/pages
+      {
+        // "path" : "pages/my/index",
+        "path": "pages/cashier/index",
+        "style": {
+          // "navigationBarTitleText": "服务中心"
+          "navigationStyle": "custom"
+        }
+      },
+      {
+        "path": "pages/index/index",
+        "style": {
+          "navigationBarTitleText": "启动"
         }
-        
+      },
+      {
+        "path": "pages/my/index",
+        "style": {
+          "navigationStyle": "custom"
+        }
+      },
+      // "navigationBarBackgroundColor": "#FFFF"
+      {
+        "path": "pages/index/bottombat",
+        "style": {
+          "navigationBarTitleText": ""
+        }
+      },
+      // "navigationBarBackgroundColor": "#FFFF"
+      {
+        "path": "pages/cashier/index",
+        "style": {
+          // "navigationBarTitleText": "收银台",
+          "navigationStyle": "custom",
+          "enablePullDownRefresh": true
+        }
+      },
+      {
+        "path": "pages/storemanagement/index",
+        "style": {
+          "navigationBarTitleText": ""
+        }
+      },
+      {
+        "path": "pages/ordermanagement/index",
+        "style": {
+          // "navigationBarTitleText": "订单管理"
+          "navigationStyle": "custom"
+        }
+      },
+	  {
+	    "path": "pages/onlineproductselection/onlineproductselection",
+	    "style": {
+	      // "navigationBarTitleText": "在线选品"
+	      "navigationStyle": "custom",
+		  "enablePullDownRefresh": true
+	    }
+	  }
     ],
     "subPackages" : [
         //用户登陆--分包
@@ -209,7 +223,8 @@
                 	"path" : "productManagementModule/productManagement",
                 	"style" : 
                 	{
-                		"navigationStyle" : "custom"
+                		"navigationStyle" : "custom",
+						"enablePullDownRefresh": true
                 	}
                 },
                 {
@@ -299,10 +314,10 @@
                 "text" : "收银台"
             },
             {
-                "pagePath" : "pages/storemanagement/index",
+                "pagePath" : "shop/productManagementModule/productManagement",
                 "iconPath" : "static/tab/dian.png",
                 "selectedIconPath" : "static/tab/dian1.png",
-                "text" : "消息"
+                "text" : "商品管理"
             },
             {
                 "pagePath" : "pages/ordermanagement/index",
@@ -311,10 +326,10 @@
                 "text" : "订单管理"
             },
             {
-                "pagePath" : "pages/my/index",
-                "iconPath" : "static/tab/wo.png",
-                "selectedIconPath" : "static/tab/wo1.png",
-                "text" : "服务中心"
+                "pagePath" : "pages/onlineproductselection/onlineproductselection",
+                "iconPath" : "static/tab/shangpin.png",
+                "selectedIconPath" : "static/tab/shangpin2.png",
+                "text" : "在线选品"
             }
         ]
     }

pages/my/index.vue

@@ -14,7 +14,7 @@
 					</view>
 				</view>
 			</view>
-			<view class="listadd-annkiu" @click="logoutAction" v-if="uid">
+			<view class="listadd-annkiu" @click="logoutAction" v-if="uid && false">
 				退出登录
 			</view>
 		</view>
@@ -28,34 +28,35 @@
 	export default {
 		data() {
 			return {
-				mnu: [{
-						name: "分润设置",
-						url: "https://cdn.bjtdba.com/vod/image/2022-08-12/20220812161807687.png",
-						pages:"/shop/services/setting",
-						show:true,
-						id: "3",
-					},
-					{
-						name: "我的音响",
-						url: "https://cdn.bjtdba.com/vod/image/2022-08-12/20220812161749139.png",
-						pages:"/shop/services/mystereo",
-						show:true,
-						id: "0",
-					},
-					{
-						name: "锁定用户",
-						url: "https://cdn.bjtdba.com/vod/image/2022-08-12/20220812161733260.png",
-						pages:"/shop/services/lockuser",
-						show:true,
-						id: "0",
-					},
-					{
-						name: "商品管理",
-						url: "https://cdn.bjtdba.com/vod/image/2022-08-12/20220812161733260.png",
-						pages:"/shop/productManagementModule/productManagement",
-						show:true,
-						id: "0",
-					}
+				mnu: [
+					// {
+					// 	name: "分润设置",
+					// 	url: "https://cdn.bjtdba.com/vod/image/2022-08-12/20220812161807687.png",
+					// 	pages:"/shop/services/setting",
+					// 	show:true,
+					// 	id: "3",
+					// },
+					// {
+					// 	name: "我的音响",
+					// 	url: "https://cdn.bjtdba.com/vod/image/2022-08-12/20220812161749139.png",
+					// 	pages:"/shop/services/mystereo",
+					// 	show:true,
+					// 	id: "0",
+					// },
+					// {
+					// 	name: "锁定用户",
+					// 	url: "https://cdn.bjtdba.com/vod/image/2022-08-12/20220812161733260.png",
+					// 	pages:"/shop/services/lockuser",
+					// 	show:true,
+					// 	id: "0",
+					// },
+					// {
+					// 	name: "商品管理",
+					// 	url: "https://cdn.bjtdba.com/vod/image/2022-08-12/20220812161733260.png",
+					// 	pages:"/shop/productManagementModule/productManagement",
+					// 	show:true,
+					// 	id: "0",
+					// }
 				],
 				uid: '',
 				authorization: ''

pages/onlineproductselection/onlineproductselection.vue

@@ -0,0 +1,19 @@
+<template>
+	<view>
+		在线选品模块
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				
+			};
+		}
+	}
+</script>
+
+<style lang="scss">
+
+</style>

pages/ordermanagement/index.vue

@@ -141,15 +141,15 @@
 			
 		},
 		onShow() {
-			uni.showLoading({
-				title: '加载中',
-			});
+			// uni.showLoading({
+			// 	title: '加载中',
+			// });
 			let selectmerchant = uni.getStorageSync('selectmerchant')
 			this.mer_id = selectmerchant.merId
-			this.getOrderStstusAmount()
-			
-			
-			
+			// this.getOrderStstusAmount()
+			
+			
+			
 			
 		},
 		methods: {
@@ -191,51 +191,51 @@
 					console.log(fail)
 				})
 			},
-			jiru(e,i) {
-				
-				
-				let authorization = uni.getStorageSync('authorization')
-				let userinfo = uni.getStorageSync('userinfo')
-				let selectmerchant = uni.getStorageSync('selectmerchant')
+			jiru(e,i) {
+				
+				
+				let authorization = uni.getStorageSync('authorization')
+				let userinfo = uni.getStorageSync('userinfo')
+				let selectmerchant = uni.getStorageSync('selectmerchant')
 				let uid = userinfo.uid
 				uni.redirectTo({
 					url: "../../shop/commodity/order?status="+e + "&index="+ i
 				})
-				return
-				if (authorization && uid) {
-					if (selectmerchant.merId >= 0 && selectmerchant.status == -1) {
-						uni.redirectTo({
-							url: "/openmerchant/guide/index" //有或者没有商户 没有金额支付and激活码支付
-						});
-						return
-					} else if (selectmerchant.merId > 0 && (selectmerchant.status == 1 || selectmerchant.status == 5)) {
-						uni.redirectTo({
-							url: "../../shop/commodity/order?status="+e + "&index="+ i
-						})
-						return
-					} else if (selectmerchant.merId >= 0 && (selectmerchant.status == 3 || selectmerchant.status == 4)) {
-						uni.redirectTo({
-							url: '/openmerchant/shopentry/process?mer_id=' + selectmerchant.merId //已开通商户未填写资料
-						});
-						return
-					} else if (selectmerchant.merId > 0 && selectmerchant.status == 0) {
-						uni.redirectTo({
-							url: '/openmerchant/shopentry/processaudit?submitCode=' + 3 //已开通商户待审核
-						});
-						return
-					} else if (selectmerchant.merId > 0 && selectmerchant.status == 2) {
-						uni.redirectTo({
-							url: '/openmerchant/shopentry/processaudit?submitCode=' + 2 //已开通商户审核拒绝
-						});
-						return
-					}
-				
-				} else {
-					uni.navigateTo({
-						url: "/pages/user/login/index?type=1"
-					});
-					return
-				}
+				return
+				if (authorization && uid) {
+					if (selectmerchant.merId >= 0 && selectmerchant.status == -1) {
+						uni.redirectTo({
+							url: "/openmerchant/guide/index" //有或者没有商户 没有金额支付and激活码支付
+						});
+						return
+					} else if (selectmerchant.merId > 0 && (selectmerchant.status == 1 || selectmerchant.status == 5)) {
+						uni.redirectTo({
+							url: "../../shop/commodity/order?status="+e + "&index="+ i
+						})
+						return
+					} else if (selectmerchant.merId >= 0 && (selectmerchant.status == 3 || selectmerchant.status == 4)) {
+						uni.redirectTo({
+							url: '/openmerchant/shopentry/process?mer_id=' + selectmerchant.merId //已开通商户未填写资料
+						});
+						return
+					} else if (selectmerchant.merId > 0 && selectmerchant.status == 0) {
+						uni.redirectTo({
+							url: '/openmerchant/shopentry/processaudit?submitCode=' + 3 //已开通商户待审核
+						});
+						return
+					} else if (selectmerchant.merId > 0 && selectmerchant.status == 2) {
+						uni.redirectTo({
+							url: '/openmerchant/shopentry/processaudit?submitCode=' + 2 //已开通商户审核拒绝
+						});
+						return
+					}
+				
+				} else {
+					uni.navigateTo({
+						url: "/pages/user/login/index?type=1"
+					});
+					return
+				}
 				
 				
 			}

pages/user/login/index.vue

@@ -222,8 +222,9 @@
 			// 暂不登录
 			unLogin() {
 				setTimeout(function() {
+					console.log('暂不登录')
 					uni.switchTab({
-						url: '../../my/index'
+						url: '../../onlineproductselection/onlineproductselection'
 					});
 				}, 300);
 			},

shop/commodity/order.vue

@@ -182,6 +182,7 @@
 			},
 			// 正向订单列表
 			orderList() {
+				return fasle;
 				uni.showLoading({
 					title: '加载中',
 				});

shop/productManagementModule/addProduct.vue

@@ -1,20 +1,27 @@
 <template>
-	<view>
-		
-	</view>
+  <view class="product-add-wrapper">
+    <headersVue headerTitle="添加商品" @headerJump="headerJump"></headersVue>
+  </view>
 </template>
 
 <script>
-	//添加商品
-	export default {
-		data() {
-			return {
-				
-			};
-		}
-	}
+//添加商品
+import headersVue from "../components/headers/headers.vue";
+export default {
+  components: {
+    headersVue
+  },
+  data() {
+    return {};
+  },
+  methods: {
+    headerJump() {
+      uni.switchTab({
+        url: "./productManagement"
+      });
+    }
+  }
+};
 </script>
 
-<style lang="scss">
-
-</style>
+<style lang="scss"></style>

shop/productManagementModule/components/tablist.vue

@@ -27,50 +27,6 @@
         </view>
       </scroll-view>
     </view>
-    <!-- <swiper @change="change" :current="isActive" class="swiper-content" :style="fullHeight">
-			<swiper-item class="swiperitem-content">
-				<scroll-view scroll-y style="height: 100%;">
-					<view class="nav_item" >
-						1
-					</view>
-				</scroll-view>	
-			</swiper-item>
-			<swiper-item class="swiperitem-content">
-				<scroll-view scroll-y style="height: 100%;">
-					<view class="nav_item" >
-						2
-					</view>
-				</scroll-view>	
-			</swiper-item>
-			<swiper-item class="swiperitem-content">
-				<scroll-view scroll-y style="height: 100%;">
-					<view class="nav_item" >
-						3
-					</view>
-				</scroll-view>
-			</swiper-item>
-			<swiper-item class="swiperitem-content">
-				<scroll-view scroll-y style="height: 100%;">
-					<view class="nav_item" >
-						4
-					</view>
-				</scroll-view>	
-			</swiper-item>
-			<swiper-item class="swiperitem-content">
-				<scroll-view scroll-y style="height: 100%;">
-					<view class="nav_item" >
-						5
-				    </view>
-				</scroll-view>	
-			</swiper-item>
-			<swiper-item class="swiperitem-content">
-				<scroll-view scroll-y style="height: 100%;">
-					<view class="nav_item" >
-						6
-				    </view>
-				</scroll-view>	
-			</swiper-item>
-		</swiper> -->
   </view>
 </template>
 <script>
@@ -185,9 +141,9 @@ export default {
         align-items: center;
         flex-wrap: nowrap;
         box-sizing: border-box;
-        height: 100rpx;
+        // height: 100rpx;
         .tab-scroll_item {
-          line-height: 80rpx;
+          // line-height: 60rpx;
           margin-right: 35rpx;
           flex-shrink: 0;
           display: flex;
@@ -199,8 +155,12 @@ export default {
             display: flex;
             align-items: center;
             flex-direction: column;
+			.name-box{
+				
+			}
             .count {
-              height: initial;
+               padding: 13rpx 0;
+			 
             }
           }
         }

shop/productManagementModule/productManagement.vue

@@ -1,12 +1,12 @@
 <template>
   <view class="product-manger-wrapper">
-    <headersVue headerTitle="商品管理" @headerJump="headerJump"></headersVue>
+    <!-- <headersVue headerTitle="商品管理" @headerJump="headerJump"></headersVue> -->
     <view class="product-manger-content">
       <view class="product-manger-content--top">
         <searchVue @search="search" class="search-box"></searchVue>
         <view class="btn-product" @click="onHandleAddProduct">
           <image
-            src="/static/images/new_ui/tianjiachanping.png"
+            src="/static/images/new_ui/tianjiachanpin.png"
             mode="scaleToFill"
           />
           <view class="txt">添加商品</view>
@@ -32,10 +32,13 @@ export default {
   },
   methods: {
     headerJump() {
-      console.log("点击了返回");
       uni.switchTab({ url: "/pages/my/index" });
     },
-    onHandleAddProduct() {}
+    onHandleAddProduct() {
+		uni.redirectTo({
+			url:`./addProduct`
+		})
+	}
   },
   data() {
     return {
@@ -88,8 +91,8 @@ page {
 </style>
 <style lang="scss" scoped>
 .product-manger-wrapper {
-  margin-top: 96rpx;
-  border: 2rpx solid #f00;
+  // margin-top: 96rpx;
+  // border: 2rpx solid #f00;
   background: #fff;
   .product-manger-content {
     &--top {

shop/productManagementModule/scanCodeIdentifiedTreasure.vue

@@ -1,6 +1,7 @@
 <template>
-	<view>
-		
+  <view class="product-manger-wrapper">
+    <!-- <headersVue headerTitle="在线选品" @headerJump="headerJump"></headersVue> -->
+	在线选品
 	</view>
 </template>
 
@@ -13,7 +14,9 @@
 			}
 		},
 		methods: {
-			
+			headerJump(){
+				
+			}
 		}
 	}
 </script>