fix:add

manifest.json

@@ -89,8 +89,12 @@
             "proxy" : {
                 // 自行修改下方的 /web
                 "/gateway" : {
-                    // "secure": false,
-                    "target" : "https://api.hxxfb.com"
+                  // "secure": false,
+                  "target": "https://api.hxxfb.com",
+                  "pathRewirte": {
+                    //路径重写
+                    "^/gateway": "/gateway"
+                  }
                 },
                 // "target" : "https://api.hebeiyhc.com"
                 // "target": "http://8.141.0.149:9000",

openmerchant/amountopening/index.vue

@@ -78,10 +78,9 @@
 <script>
 	import {
 		updateActivationCode,
-		insterMerchantOrder,
+		insterMerchantOrder,
 		selectMerchant
-	} from '@/commit/api.js';
-	
+	} from '@/commit/api.js';
 	export default {
 		data() {
 			return {
@@ -146,7 +145,7 @@
 				updateActivationCode({
 					code: this.useCode,
 					uid: this.userinfo.uid
-				}).then(res => {
+				}).then(res => {
 					console.log('激活码激活 -->',res)
 					if (res.data.status == 200) {
 						this.useCode = "";
@@ -171,66 +170,66 @@
 					console.log('激活码激活 -->',fail)
 				})
 			},
-			payment() {
-				let userInfo = uni.getStorageSync('userinfo')
-				// 用户状态判断
-				selectMerchant({
-					uid: userInfo.uid
-				}).then(data => {
-					console.log('data = ',data)
-					if (data.data.status == 200) {
-						if (data.data.data.status == -1) {
-							this.pushToUserApplet()
-						} else {
-							uni.redirectTo({
-								url: '/openmerchant/shopentry/process?mer_id=' + data.data.data.merId //已开通商户未填写资料
-							});
-							return
-						}
-					}
-				}, fail => {
-					uni.showToast({
-						title: fail,
-						icon: "none"
-					})
-				}).catch(err => {
-					console.log(err)
-				})
-				
+			payment() {
+				let userInfo = uni.getStorageSync('userinfo')
+				// 用户状态判断
+				selectMerchant({
+					uid: userInfo.uid
+				}).then(data => {
+					console.log('data = ',data)
+					if (data.data.status == 200) {
+						if (data.data.data.status == -1) {
+							this.pushToUserApplet()
+						} else {
+							uni.redirectTo({
+								url: '/openmerchant/shopentry/process?mer_id=' + data.data.data.merId //已开通商户未填写资料
+							});
+							return
+						}
+					}
+				}, fail => {
+					uni.showToast({
+						title: fail,
+						icon: "none"
+					})
+				}).catch(err => {
+					console.log(err)
+				})
+				
 				
-			},
-			
-			pushToUserApplet() {
-				
-				uni.showToast({
-					title: '功能开发中，请使用激活码开通',
-					icon: "none"
-				})
-					
-				uni.navigateToMiniProgram({
-					// appid  写你要跳转的小程序的 appid
-					appId:'wx9082e5ac2fdb513f',
-					// 路径写  src下的路径,假如你跳转的是pages下的页面,就可以写pages/index
-					// path: 'pagesA/oderPay/oder_nian',
-					path: 'pages/chuangke/index?type=100',
-					// 这个不写的话会显示开发环境,不能正常跳转,写上就能正常跳转了
-					envVersion: 'trial',  // develop（开发版），trial（体验版），release（正式版）
-					// envVersion: 'release',  // develop（开发版），trial（体验版），release（正式版）
-					success(res) {
-						// 打开成功
-						uni.showToast({
-							title: '跳转成功'
-						})
-					},
-					fail(err) {
-						console.log(err)
-						// 打开失败/取消
-						uni.showToast({
-							title: '跳转不成功'
-						})
-					}
-				})
-			},
+			},
+			
+			pushToUserApplet() {
+				
+				uni.showToast({
+					title: '功能开发中，请使用激活码开通',
+					icon: "none"
+				})
+					
+				uni.navigateToMiniProgram({
+					// appid  写你要跳转的小程序的 appid
+					appId:'wx9082e5ac2fdb513f',
+					// 路径写  src下的路径,假如你跳转的是pages下的页面,就可以写pages/index
+					// path: 'pagesA/oderPay/oder_nian',
+					path: 'pages/chuangke/index?type=100',
+					// 这个不写的话会显示开发环境,不能正常跳转,写上就能正常跳转了
+					envVersion: 'trial',  // develop（开发版），trial（体验版），release（正式版）
+					// envVersion: 'release',  // develop（开发版），trial（体验版），release（正式版）
+					success(res) {
+						// 打开成功
+						uni.showToast({
+							title: '跳转成功'
+						})
+					},
+					fail(err) {
+						console.log(err)
+						// 打开失败/取消
+						uni.showToast({
+							title: '跳转不成功'
+						})
+					}
+				})
+			},
 			
 			pay(appId, timeStamp, nonceStr, pack, signType, paySign) {
 				wx.requestPayment({

pages.json

@@ -5,7 +5,7 @@
         // "path" : "pages/my/index",
         "path": "pages/cashier/index",
         "style": {
-          // "navigationBarTitleText": "服务中心"
+          // "navigationBarTitleText": "收银台"
           "navigationStyle": "custom"
         }
       },
@@ -18,7 +18,8 @@
       {
         "path": "pages/my/index",
         "style": {
-          "navigationStyle": "custom"
+          "navigationStyle": "custom" 
+		  // "navigationBarTitleText": "服务中心"
         }
       },
       // "navigationBarBackgroundColor": "#FFFF"
@@ -256,6 +257,14 @@
                 	{
                 		"navigationStyle" : "custom"
                 	}
+                },
+                {
+                	"path" : "productManagementModule/index",
+                	"style" : 
+                	{
+                		// "navigationBarTitleText" : "",
+                		"navigationStyle" : "custom"
+                	}
                 }
             ]
         },
@@ -323,7 +332,9 @@
                 "text" : "收银台"
             },
             {
-                "pagePath" : "shop/productManagementModule/productManagement",
+                // "pagePath" : "shop/productManagementModule/productManagement",
+                "pagePath" : "shop/productManagementModule/index",
+               
                 "iconPath" : "static/tab/dian.png",
                 "selectedIconPath" : "static/tab/dian1.png",
                 "text" : "商品管理"
@@ -340,12 +351,13 @@
                 "selectedIconPath" : "static/tab/ding1.png",
                 "text" : "订单管理"
             },
-            {
-                "pagePath" : "pages/onlineproductselection/onlineproductselection",
-                "iconPath" : "static/tab/shangpin.png",
-                "selectedIconPath" : "static/tab/shangpin2.png",
-                "text" : "在线选品"
-            }
+			{
+				 "pagePath" :"pages/my/index",
+				 "iconPath" : "/static/tab/wo.png",
+				 "selectedIconPath" : "/static/tab/wo1.png",
+				  "text" : "服务中心"
+			}
+           
         ]
     }
 }

pages/my/index.vue

@@ -57,6 +57,13 @@
 					// 	show:true,
 					// 	id: "0",
 					// }
+					{
+						name: "在线选品",
+						url: "https://cdn.bjtdba.com/vod/image/2022-08-12/20220812161733260.png",
+						pages:"/pages/onlineproductselection/onlineproductselection",
+						show:true,
+						id: "0",
+					}
 				],
 				uid: '',
 				authorization: ''
@@ -288,7 +295,7 @@
 				font-size: 46rpx;
 				font-weight: 500;
 				color: #333333;
-				top: 202rpx;
+				top: 60rpx;
 				left: 64rpx;
 			}
 

pages/user/login/index.vue

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

shop/productManagementModule/addProduct.vue

@@ -1,27 +1,217 @@
 <template>
   <view class="product-add-wrapper">
-    <headersVue headerTitle="添加商品" @headerJump="headerJump"></headersVue>
+    <view class="headers">
+      <headersVue headerTitle="添加商品" @headerJump="headerJump"></headersVue>
+      <view class="headers-title">
+        <view class="content"> 该功能仅支持单规格商品快速添加，可在PC </view>
+      </view>
+    </view>
+    <view class="content-wrrapper">
+      <uploadVue formItemTitle="商品封面" :maxLimit="1"></uploadVue>
+      <uploadVue formItemTitle="商品轮播图"></uploadVue>
+      <view class="business-box">
+        <view class="business-box-txt">商品详情 </view>
+        <view class="business-box--arae">
+          <textarea
+            @blur="bindTextAreaBlur"
+            :maxlength="-1"
+            auto-height
+            class="araebox"
+          />
+        </view>
+        <uploadVue :maxLimit="200" class="upload-boxx"></uploadVue>
+      </view>
+      <view class="form-box">
+        <view class="form-item-box">
+          <view class="form-box-txt mustBox">商户商品分类</view>
+          <view class="form-box--arae"> 選擇 </view>
+		  <uni-icons type="right" size="30" class="icon-boxx"></uni-icons>
+        </view>
+		 <view class="form-item-box">
+          <view class="form-box-txt mustBox">商户商品分类</view>
+          <view class="form-box--arae"> 選擇 </view>
+        </view>
+      </view>
+    </view>
+    <view class="btn-list">
+      <view class="btn quxiao"> 保存草稿 </view>
+      <view class="btn primary"> 发布商品 </view>
+    </view>
   </view>
 </template>
 
 <script>
 //添加商品
 import headersVue from "../components/headers/headers.vue";
+import uploadVue from "./components/upload.vue";
 export default {
   components: {
-    headersVue
+    headersVue,
+    uploadVue,
   },
   data() {
     return {};
   },
   methods: {
     headerJump() {
-      uni.switchTab({
-        url: "./productManagement"
+      uni.redirectTo({
+        url: "/shop/productManagementModule/productManagement",
       });
-    }
-  }
+    },
+    bindTextAreaBlur(e) {
+      console.log(e.detail.value);
+    },
+  },
 };
 </script>
+<style>
+page {
+  background-color: #f7f8fc;
+  height: 100%;
+}
+</style>
+<style lang="scss" scoped>
+.product-add-wrapper {
+  height: 100%;
+  overflow: hidden;
+  .headers {
+    .headers-title {
+      display: flex;
+      align-items: center;
+      width: 100%;
+      background: #fff9ed;
+      padding: 16px 20rpx;
+      margin-top: 88rpx;
+      .content {
+        font-family: PingFangSC, PingFang SC;
+        font-weight: 400;
+        font-size: 26rpx;
+        color: #ff6010;
+      }
+    }
+  }
+}
+.content-wrrapper {
+  height: calc(100% - 350rpx);
+  overflow-y: auto;
+  padding-bottom: 60rpx;
+  .business-box {
+    width: calc(100% - 0rpx);
+    // border: 2rpx solid #f00;
+    margin: 26rpx 0;
+    display: flex;
+    flex-direction: column;
+    justify-content: space-between;
+    align-items: flex-start;
+    padding: 32rpx 32rpx 0;
+    box-sizing: border-box;
+    background-color: #ffffff;
+    min-height: 500rpx;
+    .business-box-txt {
+      width: 100%;
+      font-weight: 600;
+      font-size: 30rpx;
+      color: #333333;
+      margin-bottom: 20rpx;
+      &::after {
+        content: "*";
+        color: #f00;
+        padding-left: 10rpx;
+      }
+    }
+    .upload-boxx {
+      padding: 19rpx 0 !important;
+    }
+    .business-box--arae {
+      width: 100%;
+      //  border: 2rpx solid #f00;
+      background: #f8f8f8;
+      border-radius: 9rpx;
+      min-height: 208rpx;
+      .araebox {
+        padding: 20rpx 18rpx 20rpx 26rpx;
+        width: calc(100% - 46rpx);
+        height: 100%;
+      }
+    }
+  }
+}
 
-<style lang="scss"></style>
+.btn-list {
+  background-color: #fff;
+  display: flex;
+  gap: 26rpx;
+  user-select: none;
+  padding: 15rpx 26rpx 0rpx;
+  height: 126rpx;
+  .btn {
+    flex: 1;
+    flex-shrink: 0;
+    height: 78rpx;
+    border-radius: 8rpx;
+    font-weight: 400;
+    font-size: 30rpx;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+  }
+  .quxiao {
+    border: 1rpx solid #999999;
+    color: #333333;
+  }
+  .primary {
+    color: #ffffff;
+    background: #1f7cff;
+  }
+}
+.form-box {
+  min-height: 217rpx;
+  background: #ffffff;
+  border: 2rpx solid #f00;
+  padding: 0 32rpx;
+  .form-item-box {
+	display: flex;
+    align-items: center;
+    padding: 26rpx 0;
+    border-bottom: 2rpx solid #f8f8f8;
+	position: relative;
+    &:last-child {
+      border-bottom: none;
+    }
+	.icon-boxx{
+		position: absolute;
+		right: -26rpx;
+		top: 28rpx;
+	}
+    .form-box-txt {
+      font-family: PingFangSC, PingFang SC;
+      font-weight: 400;
+      font-size: 30rpx;
+      color: #333333;
+	//   height: 100%;
+      line-height: 42rpx;
+
+
+	  width: 230rpx;
+	  flex-shrink: 0;
+    }
+    .form-box--arae {
+		display: flex;
+    align-items: center;
+	justify-content: flex-end;
+      font-weight: 400;
+      font-size: 30rpx;
+      color: #333333;
+	  flex: 1;
+	  padding-right: 20rpx;
+    }
+  }
+}
+.mustBox {
+  &::after {
+    content: "*";
+    color: #f00;
+    padding-left: 10rpx;
+  }
+}
+</style>

shop/productManagementModule/components/upload.vue

@@ -0,0 +1,242 @@
+<template>
+  <view class="upload-wrapper">
+    <view class="upload-wrapper-text ismust" v-if="formItemTitle"> {{ formItemTitle }} </view>
+    <view class="upload-wrapper-upload">
+      <view class="upload-files-content">
+        <template v-if="fileListData.length > 0">
+          <view
+            class="upload-files"
+            v-for="(item, index) in fileListData"
+            :key="index+item.path"
+          >
+            <view class="image-box">
+              <image :src="item.path" class="show-image-box"></image>
+              <image
+                src="/static/images/new_ui/guanbi.png"
+                class="close-box"
+                v-if="!disabledDetele"
+                @click="onHandleDelete(item, index)"
+              ></image>
+            </view>
+          </view>
+        </template>
+        <view class="upload-no-files" :style="getUploadClass" v-if="isHidden"  @click="uploadDataFiles">
+          <image src="/static/images/new_ui/xiangji.png"></image>
+          <view class="upload-no-files__text"> {{ setImageTitle }} </view>
+        </view>
+      </view>
+    </view>
+  </view>
+</template>
+
+<script>
+export default {
+  props: {
+    maxLimit: {
+      type: Number,
+      default: 5,
+    },
+    disabled: {
+      type: Boolean,
+      default: false,
+    },
+    disabledDetele: {
+      type: Boolean,
+      default: false,
+    },
+    formItemTitle: {
+      type: String,
+      default: "",
+    },
+    isMust: {
+      type: Boolean,
+      default: false,
+    },
+	imageTitle:{
+		type: String,
+		default: "",
+	},
+	index:{
+		type: Number,
+		default: 0,
+	}
+  },
+  data() {
+    return {
+      fileListData: [],
+    };
+  },
+  methods: {
+	emitChangeFiles(data){
+		this.$emit('changeFiles',{
+			fileList:data || [],
+			index:this.index
+		})
+		// console.log(data,"emitChangeFiles")
+	},
+    uploadDataFiles() {
+		if(this.disabled || this.maxLimit == 0){
+			return ;
+		}
+      let that = this;
+      uni.chooseImage({
+        count:1, // 最多可以选择的图片张数，默认9
+        // sizeType: ["compressed"], // original 原图，compressed 压缩图，默认二者都有
+        sourceType: ["album", "camera"], // album 从相册选图，camera 使用相机，默认二者都有
+        success: function (res) {
+          console.log(res, "456456465");
+          if (that.maxLimit.length === 0) {
+          	that.fileListData.push({
+				path:res.tempFilePaths[0],
+				Files:res.tempFiles[0]
+			})
+          } else if (that.fileListData.length < that.maxLimit) {
+          	that.fileListData = that.fileListData.concat({
+				path:res.tempFilePaths[0],
+				Files:res.tempFiles[0]
+			}); //concat追加到数组
+          }
+		   that.emitChangeFiles(that.fileListData)
+		//   console.log(that.fileListData,"that.fileListData")
+        },
+		fail() {
+			  that.emitChangeFiles([])
+		}
+		
+      });
+	 
+      // let that = this;
+      // that.$time.uploadPictures((res) => {
+      //   console.log(res);
+      //   // that.merchantsIn.business_license = res;
+      // });
+    },
+    onHandleDelete(item, index) {
+      if (!this.disabledDetele) {
+        this.fileListData.splice(index, 1);
+		console.log(this.fileListData,"this.fileListData")
+		 this.emitChangeFiles(this.fileListData)
+      }
+    },
+  },
+  computed: {
+    isHidden() {
+      return this.fileListData.length < this.maxLimit;
+    },
+    setImageTitle() {
+      if (this.disabled || this.maxLimit == 0) {
+        return "禁止上传图片";
+      } else if (
+        this.fileListData.length < this.maxLimit &&
+        this.fileListData.length > 0 && this.imageTitle
+      ) {
+        return `${this.fileListData.length} / ${this.maxLimit}`;
+      } else {
+        return "添加图片";
+      }
+    },
+    getUploadClass() {
+      let isZeo = this.fileListData.length > 0;
+      let styles = {};
+      if (isZeo) {
+        styles = {
+          width: "208rpx",
+        };
+      } else {
+        styles = {
+          width: "100%",
+        };
+      }
+      return styles;
+    },
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+.upload-wrapper {
+  width: calc(100% - 0rpx);
+  // border: 2rpx solid #f00;
+  display: flex;
+  flex-direction: column;
+  justify-content: space-between;
+  align-items: flex-start;
+  padding: 32rpx;
+  box-sizing: border-box;
+  background-color: #ffffff;
+  .upload-wrapper-text {
+    width: 100%;
+    font-weight: 600;
+    font-size: 30rpx;
+    color: #333333;
+    margin-bottom: 20rpx;
+    &.ismust {
+      &::after {
+        content: "*";
+        color: #f00;
+        padding-left: 10rpx;
+      }
+    }
+  }
+  .upload-wrapper-upload {
+    width: 100%;
+    user-select: none;
+    border-radius: 8rpx;
+    display: flex;
+    justify-content: flex-start;
+    align-items: center;
+    .upload-files-content {
+      // border: 2rpx solid #f00;
+
+      display: flex;
+      flex-wrap: wrap;
+      gap: 20rpx;
+      width: 100%;
+    }
+    .upload-no-files {
+      height: 208rpx;
+      width: 100%;
+      // background: #f00;
+      background: #f8f8f8;
+      display: flex;
+      justify-content: center;
+      align-items: center;
+      flex-direction: column;
+      flex-shrink: 0;
+      border-radius: 16rpx;
+      .upload-no-files__text {
+        font-weight: 400;
+        font-size: 26rpx;
+        color: #333333;
+      }
+      image {
+        width: 72rpx;
+        height: 72rpx;
+      }
+    }
+
+    .upload-files {
+      display: flex;
+      // border: 2rpx solid #ff0;
+      gap: 26rpx;
+      flex-wrap: wrap;
+      border-radius: 16rpx;
+      .image-box {
+        position: relative;
+        border-radius: 16rpx;
+        .show-image-box {
+          width: 208rpx;
+          height: 210rpx;
+        }
+        .close-box {
+          position: absolute;
+          right: 0rpx;
+          top: 0;
+          width: 42rpx;
+          height: 42rpx;
+        }
+      }
+    }
+  }
+}
+</style>

shop/productManagementModule/index.vue

@@ -0,0 +1,316 @@
+<template>
+	<view class="storemanagement">
+		<view class="storemanagement-header">
+			<view class="storemanagement-header-text">
+				商品管理
+			</view>
+			<view class="storemanagement-list">
+				<view class="storemanagement-list-yi" v-for="(item,index) in mnu" :key="index" @click="jinru(item.pages,item.name)" v-if="item.show">
+					<view class="storemanagement-list-yi-text">
+						{{item.name}}
+					</view>
+					<view class="storemanagement-list-yi-image">
+						<image :src="item.url" mode="widthFix"></image>
+					</view>
+				</view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	import readAppInfo from '@/utils/readAppInfo.js';
+	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",
+					// }
+					{
+						name: "在线选品",
+						url: "https://cdn.bjtdba.com/vod/image/2022-08-12/20220812161733260.png",
+						pages:"/pages/onlineproductselection/onlineproductselection",
+						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: ''
+			}
+		},
+		async onLoad() {
+			console.log('进了我的页面了')
+			// uni.showLoading({
+			// 	title: '加载中',
+			// 	mask: true
+			// });
+			
+			await readAppInfo();
+			
+			let jurisdiction = uni.getStorageSync('jurisdiction')
+			console.log('jurisdiction', jurisdiction)
+			let mnuList = this.mnu
+			if (jurisdiction) {
+				jurisdiction.forEach((res, index) => {
+					mnuList.forEach((result, i) => {
+						if (res == result.id) {
+							result.show = true
+						}
+						return result
+					})
+					return res
+				})
+				this.mnu = mnuList
+			}
+			
+			console.log(this.mnu)
+			
+			setTimeout(function() {
+				uni.hideLoading();
+			}, 700);
+			
+			
+			console.log('我的show===>>>>>>')
+			
+			
+			this.authorization = uni.getStorageSync('authorization')
+			let userinfo = uni.getStorageSync('userinfo')
+			this.uid = userinfo.uid
+			console.log('onshow')
+			
+			let authorization = uni.getStorageSync('authorization')
+			// let userinfo = uni.getStorageSync('userinfo')
+			let selectmerchant = uni.getStorageSync('selectmerchant')
+			let uid = userinfo.uid
+			console.log(selectmerchant, authorization, userinfo)
+			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)) {
+					
+					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
+				}
+			
+			} 
+		},
+		onShow() {
+			return;
+			
+			// 以下逻辑在onload处理
+			
+			this.authorization = uni.getStorageSync('authorization')
+			let userinfo = uni.getStorageSync('userinfo')
+			this.uid = userinfo.uid
+			
+			let authorization = uni.getStorageSync('authorization')
+			// let userinfo = uni.getStorageSync('userinfo')
+			let selectmerchant = uni.getStorageSync('selectmerchant')
+			let uid = userinfo.uid
+			console.log(selectmerchant, authorization, userinfo)
+			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)) {
+					
+					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
+				}
+			
+			} 
+			
+			
+		},
+		methods: {
+			jinru(n,p){
+				let name = p
+				let page = n
+				if(name=="分润设置") {
+					let authorization = uni.getStorageSync('authorization')
+					let userinfo = uni.getStorageSync('userinfo')
+					let selectmerchant = uni.getStorageSync('selectmerchant')
+					let uid = userinfo.uid
+					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:page
+							})
+							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
+					}
+					
+				}else if(name=="锁定用户"){
+					uni.redirectTo({
+						url:page
+					})
+				}else{
+					uni.redirectTo({
+						url:page
+					})
+				}
+			}
+		}
+	}
+</script>
+<style>
+	page {
+		background-color: #F7F8FC;
+	}
+</style>
+<style lang="scss" scoped>
+	.storemanagement {
+		width: 100%;
+		height: 100%;
+		display: flex;
+		flex-direction: column;
+		align-items: center;
+
+		.storemanagement-header {
+			width: 100%;
+			height: 328rpx;
+			background: linear-gradient(180deg, rgba(31, 124, 255, 0.2200) 0%, rgba(255, 255, 255, 0.1500) 100%);
+			position: relative;
+			display: flex;
+			justify-content: center;
+
+			.storemanagement-header-text {
+				position: absolute;
+				font-size: 46rpx;
+				font-weight: 500;
+				color: #333333;
+				top: 60rpx;
+				left: 64rpx;
+			}
+
+			.storemanagement-list {
+				width: 690rpx;
+				height: 262rpx;
+				position: absolute;
+				top: 298rpx;
+				display: flex;
+				flex-flow: wrap;
+				justify-content: space-between;
+
+				.storemanagement-list-yi {
+					margin-bottom: 26rpx;
+					width: 330rpx;
+					height: 118rpx;
+					background: #FFFFFF;
+					border-radius: 8rpx;
+					display: flex;
+					justify-content: space-around;
+					align-items: center;
+
+					.storemanagement-list-yi-text {
+						font-size: 26rpx;
+						font-weight: 500;
+						color: #333333;
+					}
+
+					.storemanagement-list-yi-image {
+						width: 92rpx;
+						height: 92rpx;
+
+						image {
+							width: 100%;
+							height: 100%;
+						}
+					}
+				}
+			}
+		}
+	}
+</style>

shop/productManagementModule/productManagement.vue

@@ -1,6 +1,6 @@
 <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>
@@ -13,7 +13,57 @@
         </view>
       </view>
       <view class="product-manger-content--tab">
-        <tabsVue :category="dataList"  />
+        <tabsVue :category="dataList" />
+      </view>
+    </view>
+    <view class="product-manger-content--list">
+      <view class="list-card" v-for="(item, index) in dataList" :key="index">
+        <view class="list-card-top">
+          <view class="list-card-top--left">
+             <image
+                src="/static/images/new_ui/tianjiachanpin.png"
+                mode="scaleToFill"
+              />
+          </view>
+          <view class="list-card-top--right">
+            <view class="list-card-top--right-title">此处显示商品名称最多一行，显示不下此处显示商品名称最多一行，显示不下</view>
+            <view class="list-card-top--right-description">
+              <view class="list-card-top--right-description--left">
+                <text class="title">销量</text>
+                <text>5000</text>
+              </view>
+              <view class="list-card-top--right-description--right">
+                <text class="title">库存</text>
+                <text>5000</text>
+              </view>
+            </view>
+            <view class="list-card-top--right-price">
+              <view class="list-card-top--right-price--left">
+                <text>¥</text>
+                <text class="price">5000</text>
+              </view>
+            </view>
+          </view>
+        </view>
+        <view class="list-card-bottom-btn">
+          <view class="list-card-bottom-btn-list">
+            <view class="list-card-bottom-btn-list--item">推荐</view>
+            <view class="list-card-bottom-btn-list--item">驳回原因</view>
+            <view class="list-card-bottom-btn-list--item">上架</view>
+            <view class="list-card-bottom-btn-list--item">下架</view>
+            <view class="list-card-bottom-btn-list--item">删除草稿</view>
+          </view>
+
+          </view>
+
+        </view>
+              <view
+        class=""
+        v-if="tihsi == 0"
+        style="margin: 60rpx 0 30rpx 0; color: #999999; font-size: 26rpx"
+      >
+        —— 已经到最底部了哦 ——
+      </view>
       </view>
     </view>
   </view>
@@ -28,60 +78,78 @@ export default {
   components: {
     headersVue,
     searchVue,
-	tabsVue
+    tabsVue,
   },
   methods: {
+    		onPullDownRefresh() {
+			uni.showLoading({
+				title: '加载中',
+			});
+			this.page = 1
+			this.is_panudn = true
+			this.list = []
+			// this.orderList();
+		},
+		onReachBottom() {
+      console.log('onReachBottom')
+			// if (this.is_panudn == true) {
+			// 	this.page++;
+			// 	this.orderList();
+			// } else {
+			// 	return
+			// }
+		},
     headerJump() {
-      uni.switchTab({ url: "/pages/my/index" });
+      uni.switchTab({ url: "/shop/productManagementModule/index" });
     },
     onHandleAddProduct() {
-		uni.redirectTo({
-			url:`./addProduct`
-		})
-	}
+      uni.redirectTo({
+        url: `./addProduct`,
+      });
+    },
   },
   data() {
     return {
+      tihsi: 0,
       dataList: [
         {
           type: 1,
           name: "出售中商品",
-          count: 10
+          count: 10,
         },
         {
           type: 2,
           name: "仓库中商品",
-          count: 31
+          count: 31,
         },
         {
           type: 3,
           name: "已售罄商品",
-          count: 0
+          count: 0,
         },
         {
           type: 4,
           name: "警戒库存",
-          count: 0
+          count: 0,
         },
         {
           type: 5,
           name: "回收站商品",
-          count: 0
+          count: 0,
         },
         {
           type: 6,
           name: "待审核商品",
-          count: 0
+          count: 0,
         },
         {
           type: 7,
           name: "审核未通过商品",
-          count: 0
-        }
+          count: 0,
+        },
       ],
-
     };
-  }
+  },
 };
 </script>
 <style>
@@ -92,9 +160,14 @@ page {
 <style lang="scss" scoped>
 .product-manger-wrapper {
   // margin-top: 96rpx;
-  // border: 2rpx solid #f00;
-  background: #fff;
+ 
+
   .product-manger-content {
+    background: #fff;
+    position: fixed;
+    top: 80rpx;
+    width: 100%;
+    z-index: 666;
     &--top {
       display: flex;
       .search-box {
@@ -120,5 +193,109 @@ page {
       }
     }
   }
+  .product-manger-content--list {
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    width: calc(100% - 52rpx);
+    // border: 2rpx solid #f00;
+    margin: 328rpx 26rpx 26rpx;
+    overflow: auto;
+    .list-card {
+      width: 100%;
+      min-height: 274rpx;
+      background: #ffffff;
+      border-radius: 8rpx;
+      margin-bottom: 26rpx;
+      box-sizing: border-box;
+      padding: 22rpx 20rpx 22rpx;
+      .list-card-top {
+        display: flex;
+        gap: 20rpx;
+        .list-card-top--left {
+          width: 150rpx;
+          height: 150rpx;
+          flex-shrink: 0;
+          border-radius: 7rpx;
+          background: #d8d8d8;
+          // text-align: center;
+          image {
+            width: 100%;
+            height: 100%;
+            border-radius: 7rpx;
+          }
+        }
+        .list-card-top--right {
+          flex: 1;
+
+          .list-card-top--right-title {
+            font-family: PingFangSC, PingFang SC;
+            font-weight: 400;
+            font-size: 26rpx;
+            color: #333333;
+            line-height: 37rpx;
+            display: -webkit-box;
+            -webkit-box-orient: vertical;
+            -webkit-line-clamp: 1;
+            overflow: hidden;
+          }
+          .list-card-top--right-description {
+            font-family: PingFangSC, PingFang SC;
+            font-weight: 400;
+            font-size: 22rpx;
+            color: #666666;
+            line-height: 30rpx;
+            word-break: break-all;
+            display: flex;
+            gap: 20rpx;
+            justify-content: flex-start;
+            padding: 13rpx 0 20rpx 0;
+          }
+          .list-card-top--right-description--left,
+          .list-card-top--right-description--right {
+            flex: 40%;
+            .title {
+              padding-right: 16rpx;
+            }
+          }
+          .list-card-top--right-price {
+            font-family: PingFangSC, PingFang SC;
+            .list-card-top--right-price--left {
+              word-break: break-all;
+              .price {
+                font-weight: 600;
+                font-size: 36rpx;
+                color: #333333;
+                line-height: 38rpx;
+              }
+            }
+          }
+        }
+      }
+      .list-card-bottom-btn {
+        padding-top: 30rpx;
+        .list-card-bottom-btn-list {
+          display: flex;
+          justify-content: flex-end;
+          align-items: center;
+          flex-wrap: wrap;
+          gap: 20rpx;
+          user-select: none;
+          .list-card-bottom-btn-list--item {
+            display: flex;
+            justify-content: center;
+            align-items: center;
+            width: 146rpx;
+            height: 60rpx;
+            border-radius: 8rpx;
+            border: 1rpx solid #e5e5e5;
+            font-weight: 400;
+            font-size: 24rpx;
+            color: #333333;
+          }
+        }
+      }
+    }
+  }
 }
 </style>