diff --git a/config/api.js b/config/api.js
index ed1e83f..9d865b9 100644
--- a/config/api.js
+++ b/config/api.js
@@ -6,10 +6,7 @@
 const dev = {
 	common: "https://common-api.pickmall.cn",
 	buyer: "https://buyer-api.pickmall.cn",
-	// common: 'http://192.168.0.101:8890',
-	// buyer: 'http://192.168.0.101:8888',
-	// seller: 'http://192.168.0.101:8889',
-	// manager: 'http://192.168.0.101:8887'
+	
 
 };
 // 生产环境
diff --git a/manifest.json b/manifest.json
index a90b4f9..36e7601 100644
--- a/manifest.json
+++ b/manifest.json
@@ -2,8 +2,8 @@
     "name" : "lili商城",
     "appid" : "__UNI__C100675",
     "description" : "",
-    "versionName" : "4.0.23",
-    "versionCode" : 4000023,
+    "versionName" : "4.0.24",
+    "versionCode" : 4000024,
     "transformPx" : false,
     "app-plus" : {
         "compatible" : {
diff --git a/pages.json b/pages.json
index dc811b9..ddc8d6e 100644
--- a/pages.json
+++ b/pages.json
@@ -36,13 +36,7 @@
 				
 			}
 		},
-		{
-			"path": "pages/navigation/point/point-mall",
-			"style": {
-				"navigationBarTitleText": "积分商城",
-				"enablePullDownRefresh": true
-			}
-		},		
+				
 		{
 			"path": "pages/navigation/search/searchPage",
 			"style": {
@@ -504,6 +498,13 @@
 						"navigationStyle": "custom",
 						"navigationBarTextStyle": "white"
 
+					}
+				},{
+					"path": "point/pointList",
+					"style": {
+						"navigationBarTitleText": "积分商城"
+						
+
 					}
 				}
 
@@ -752,12 +753,7 @@
 				"selectedIconPath": "static/tabbar/category-s.png",
 				"text": "分类"
 			},
-			// {
-			// 	"pagePath": "pages/navigation/point/point-mall",
-			// 	"iconPath": "static/tabbar/point-mall.png",
-			// 	"selectedIconPath": "static/tabbar/point-mall-s.png",
-			// 	"text": "积分商城"
-			// },
+		
 			{
 				"pagePath": "pages/tabbar/cart/cartList",
 				"iconPath": "static/tabbar/cart.png",
diff --git a/pages/cart/payment/payOrder.vue b/pages/cart/payment/payOrder.vue
index 4f17c6b..aa69401 100644
--- a/pages/cart/payment/payOrder.vue
+++ b/pages/cart/payment/payOrder.vue
@@ -1,47 +1,46 @@
 <template>
-	<div class="wrapper">
-		<div class="box">
-			<div class="block block-1">
-				<image class="img" src="@/pages/cart/static/pay.png" />
-				<p class="ptips">收银台</p>
+  <div class="wrapper">
+    <div class="box">
+      <div class="block block-1">
+        <image class="img" src="@/pages/cart/static/pay.png" />
+        <p class="ptips">收银台</p>
 
-				<p class="ptips">剩余支付时间：
-					<u-count-down :show-days="false" :show-border="true" font-size="28" color="#008ffa"
-						border-color="#008ffa" ref="uCountDown" :timestamp="autoCancel"></u-count-down>
-				</p>
-				<p class="ptips">
-					支付金额
-					<span>¥{{ cashierParams.price | unitPrice }}</span>
-				</p>
-			</div>
-		</div>
-		<div class="__pay_form__">
-		</div>
-		<div class="block-4" v-if="cashierParams.price > 0">
-			<div class="payItem">支付方式</div>
-			<div class="payItem" v-for="(item, index) in payList" :key="index">
-				<u-row class="row">
-					<div class="col1" @click="awaitPay(item, index)" size="100" style="text-align:left;">
-						<div v-if="item == 'ALIPAY'">
-							<u-icon class="method_icon" name="zhifubao-circle-fill" color="#008ffa" size="80"></u-icon>
-							<span class="method_name">支付宝</span>
-						</div>
-						<div v-if="item == 'WECHAT'">
-							<u-icon class="method_icon" name="weixin-circle-fill" color="#00c98b" size="80"></u-icon>
-							<span class="method_name">微信</span>
-						</div>
-						<div v-if="item == 'WALLET'">
-							<u-icon class="method_icon" name="red-packet-fill" color="#dd6161" size="80"></u-icon>
-							<span class="method_name">余额支付(当前余额：¥{{ walletValue | unitPrice }})</span>
-						</div>
-					</div>
-					<div class="col3" @click="awaitPay(item)" textAlign="right">
-						<u-icon size="26" color="#b1b1b1" name="arrow-right"></u-icon>
-					</div>
-				</u-row>
-			</div>
-		</div>
-	</div>
+        <p class="ptips">剩余支付时间：
+          <u-count-down :show-days="false" :show-border="true" font-size="28" color="#008ffa" border-color="#008ffa" ref="uCountDown" :timestamp="autoCancel"></u-count-down>
+        </p>
+        <p class="ptips">
+          支付金额
+          <span>¥{{ cashierParams.price | unitPrice }}</span>
+        </p>
+      </div>
+    </div>
+    <div class="__pay_form__">
+    </div>
+    <div class="block-4" v-if="cashierParams.price > 0">
+      <div class="payItem">支付方式</div>
+      <div class="payItem" v-for="(item, index) in payList" :key="index">
+        <u-row class="row">
+          <div class="col1" @click="awaitPay(item, index)" size="100" style="text-align:left;">
+            <div v-if="item == 'ALIPAY'">
+              <u-icon class="method_icon" name="zhifubao-circle-fill" color="#008ffa" size="80"></u-icon>
+              <span class="method_name">支付宝</span>
+            </div>
+            <div v-if="item == 'WECHAT'">
+              <u-icon class="method_icon" name="weixin-circle-fill" color="#00c98b" size="80"></u-icon>
+              <span class="method_name">微信</span>
+            </div>
+            <div v-if="item == 'WALLET'">
+              <u-icon class="method_icon" name="red-packet-fill" color="#dd6161" size="80"></u-icon>
+              <span class="method_name">余额支付(当前余额：¥{{ walletValue | unitPrice }})</span>
+            </div>
+          </div>
+          <div class="col3" @click="awaitPay(item)" textAlign="right">
+            <u-icon size="26" color="#b1b1b1" name="arrow-right"></u-icon>
+          </div>
+        </u-row>
+      </div>
+    </div>
+  </div>
 </template>
 <script>
 	import * as API_Trade from "@/api/trade";
@@ -160,6 +159,10 @@
 					});
 					// #endif
 
+					//判断是否微信浏览器
+					var ua = window.navigator.userAgent.toLowerCase();
+					
+					
 				
 
 					// #ifndef MP-WEIXIN
@@ -173,6 +176,14 @@
 					}
 					
 					// #endif
+					if (ua.match(/MicroMessenger/i) == 'micromessenger') {
+						console.log("微信浏览器")
+						this.payList = res.data.result.support.filter((item) => {
+							return item != "ALIPAY";
+						});
+						
+					}
+
 					this.walletValue = res.data.result.walletValue;
 					this.autoCancel =
 						(res.data.result.autoCancel - new Date().getTime()) / 1000;
@@ -376,108 +387,108 @@
 	};
 </script>
 <style scoped lang="scss">
-	.method_icon {
-		vertical-align: middle;
-	}
+.method_icon {
+  vertical-align: middle;
+}
 
-	.method_name {
-		font-size: 28rpx;
-		color: #999;
-		padding-left: 24rpx;
-	}
+.method_name {
+  font-size: 28rpx;
+  color: #999;
+  padding-left: 24rpx;
+}
 
-	.row {
-		display: flex;
-		width: 100%;
-	}
+.row {
+  display: flex;
+  width: 100%;
+}
 
-	/deep/ .u-row {
-		width: 100% !important;
-		display: flex;
-		justify-content: space-between !important;
-	}
+/deep/ .u-row {
+  width: 100% !important;
+  display: flex;
+  justify-content: space-between !important;
+}
 
-	.method_name,
-	.col1 {
-		overflow: hidden;
-		text-overflow: ellipsis;
-		white-space: nowrap;
-	}
+.method_name,
+.col1 {
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+}
 
-	.col1 {
-		text-align: center;
-		flex: 99;
-	}
+.col1 {
+  text-align: center;
+  flex: 99;
+}
 
-	.col3 {
-		text-align: right;
-		flex: 1;
-	}
+.col3 {
+  text-align: right;
+  flex: 1;
+}
 
-	.payItem {
-		padding: 13px 25rpx;
-		border-top: 1px solid #f9f9f9;
+.payItem {
+  padding: 13px 25rpx;
+  border-top: 1px solid #f9f9f9;
 
-		line-height: 100rpx;
-		font-size: 36rpx;
-		color: #333;
-	}
+  line-height: 100rpx;
+  font-size: 36rpx;
+  color: #333;
+}
 
-	.ptips {
-		font-size: 32rpx;
-		margin: 20rpx 0;
-		color: #333;
+.ptips {
+  font-size: 32rpx;
+  margin: 20rpx 0;
+  color: #333;
 
-		>span {
-			font-size: 40rpx;
-			color: #df5a52;
-			margin-left: 10rpx;
-		}
-	}
+  > span {
+    font-size: 40rpx;
+    color: #df5a52;
+    margin-left: 10rpx;
+  }
+}
 
-	.img {
-		width: 392rpx !important;
-		height: 296rpx !important;
-	}
+.img {
+  width: 392rpx !important;
+  height: 296rpx !important;
+}
 
-	.wrapper {
-		min-height: 100vh;
-		height: auto;
-		background: #f9f9f9;
-	}
+.wrapper {
+  min-height: 100vh;
+  height: auto;
+  background: #f9f9f9;
+}
 
-	.block-4 {
-		background: #fff;
-		color: $u-tips-color;
+.block-4 {
+  background: #fff;
+  color: $u-tips-color;
 
-		>p {
-			padding: 8rpx;
-		}
-	}
+  > p {
+    padding: 8rpx;
+  }
+}
 
-	.box {
-		background: #fff;
-		padding: 40rpx 0;
-		//   justify-content: center; //这个是X轴居中
-		//   align-items: center; //这个是 Y轴居中
-	}
+.box {
+  background: #fff;
+  padding: 40rpx 0;
+  //   justify-content: center; //这个是X轴居中
+  //   align-items: center; //这个是 Y轴居中
+}
 
-	.block {
-		text-align: center;
-		display: block;
-		width: 100%;
+.block {
+  text-align: center;
+  display: block;
+  width: 100%;
 
-		image {
-			width: 200rpx;
-			height: 200rpx;
-		}
-	}
+  image {
+    width: 200rpx;
+    height: 200rpx;
+  }
+}
 
-	.block-1 {
-		margin-top: 80rpx;
-	}
+.block-1 {
+  margin-top: 80rpx;
+}
 
-	.btns {
-		margin: 0 20rpx;
-	}
+.btns {
+  margin: 0 20rpx;
+}
 </style>
diff --git a/pages/order/fillorder.vue b/pages/order/fillorder.vue
index 3bac509..a645f0a 100644
--- a/pages/order/fillorder.vue
+++ b/pages/order/fillorder.vue
@@ -190,10 +190,11 @@
     <div class="box6 mp-iphonex-bottom" v-if="orderMessage.priceDetailDTO">
       <div class="tabbar-left">
         合计：
-        <span class="number">
+        <span v-if="!orderMessage.priceDetailDTO.payPoint" class="number">
           ¥
-          <span>{{ orderMessage.priceDetailDTO.billPrice | unitPrice }}</span>
+          <span>{{ orderMessage.priceDetailDTO.flowPrice | unitPrice }}</span>
         </span>
+        <span v-else class="number"><span style="margin-right:10rpx;">{{orderMessage.priceDetailDTO.payPoint | unitPrice }}</span>积分</span>
       </div>
       <div class="navRiv" @click="createTradeFun()">
         <!-- #ifndef MP-WEIXIN -->
diff --git a/pages/passport/onClickLogin.vue b/pages/passport/onClickLogin.vue
index 761fbc7..b79e618 100644
--- a/pages/passport/onClickLogin.vue
+++ b/pages/passport/onClickLogin.vue
@@ -117,23 +117,23 @@ export default {
   methods: {
     /** 根据参数显示登录模块 */
     methodFilter(code) {
-      // let way = [];
-      // this.loginList.forEach((item) => {
-      //   if (code.length != 0) {
-      //     code.forEach((val) => {
-      //       if (item.code == val) {
-      //         way.push(item);
-      //       }
-      //     });
-      //   } else {
-      //     uni.showToast({
-      //       title: '配置有误请联系管理员',
-      //       duration: 2000,
-      //       icon:"none"
-      //     });
-      //   }
-      // });
-      // this.loginList = way;
+      let way = [];
+      this.loginList.forEach((item) => {
+        if (code.length != 0) {
+          code.forEach((val) => {
+            if (item.code == val) {
+              way.push(item);
+            }
+          });
+        } else {
+          uni.showToast({
+            title: '配置有误请联系管理员',
+            duration: 2000,
+            icon:"none"
+          });
+        }
+      });
+      this.loginList = way;
     },
     /**跳转到登录页面 */
     navigateLogin(connectLogin) {
diff --git a/pages/navigation/point/point-mall.vue b/pages/promotion/point/pointList.vue
similarity index 94%
rename from pages/navigation/point/point-mall.vue
rename to pages/promotion/point/pointList.vue
index 73912c7..8210d90 100644
--- a/pages/navigation/point/point-mall.vue
+++ b/pages/promotion/point/pointList.vue
@@ -23,7 +23,6 @@
                 </u-image>
                 <view class="index-item-title">{{ item.goodsSku.goodsName }}</view>
                 <view class="index-item-price">
-
                   {{ item.points | unitPrice }}积分
                   <span class="tipsMkt">¥{{ item.goodsSku.price | unitPrice }}</span>
                 </view>
@@ -97,10 +96,11 @@ export default {
       }
     },
   },
-  async onShow() {
+  async mounted() {
     //获取顶级分类
+
     let response = await getPointsCategory();
-    
+
     if (response.data.success) {
       let navData = response.data.result.records;
       navData.forEach((item) => {
@@ -273,12 +273,11 @@ page {
 
 .swiper-box {
   // #ifdef H5
-  height: calc(100vh - 294px);
+  height: calc(100vh - (100rpx + 300rpx + 44px));
   // #endif
 
   // #ifndef H5
-
-  height: calc(100vh - 200px);
+  height: calc(100vh - 400rpx);
   // #endif
 
   .scroll-v {
diff --git a/pages/navigation/point/user.vue b/pages/promotion/point/user.vue
similarity index 92%
rename from pages/navigation/point/user.vue
rename to pages/promotion/point/user.vue
index f8c0321..df847f5 100644
--- a/pages/navigation/point/user.vue
+++ b/pages/promotion/point/user.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="user-point">
-    <div class="point-rule">积分规则</div>
+    <!-- <div class="point-rule">积分规则</div> -->
     <div class="point-wrapper">
       <u-image shape="circle" :lazy-load="true" width="100" height="100" :src="userInfo.face || '/static/missing-face.png'"></u-image>
       <div class="whether-point">
@@ -43,6 +43,7 @@ export default {
   padding: 20rpx 0;
 }
 .point-wrapper {
+  padding-top: 80rpx;
   display: flex;
 }
 .whether-point {
diff --git a/pages/tabbar/home/template/tpl.js b/pages/tabbar/home/template/tpl.js
index 557c2b5..cc5e0fa 100644
--- a/pages/tabbar/home/template/tpl.js
+++ b/pages/tabbar/home/template/tpl.js
@@ -1,7 +1,9 @@
 /** 配置楼层模块的跳转 */
 export function modelNavigateTo(item) {
   let val = item.url;
+
   switch (val.___type) {
+    
     case "goods":
       uni.navigateTo({
         url: "/pages/product/goods?id=" + val.id + "&goodsId=" + val.goodsId,
@@ -36,6 +38,7 @@ export function modelNavigateTo(item) {
       break;
     case "other":
       switch (val.title) {
+      
         case "首页":
           uni.switchTab({
             url: `/pages/tabbar/home/index`,
@@ -92,8 +95,8 @@ export function modelNavigateTo(item) {
           });
           break;
         case "积分商城":
-          uni.switchTab({
-            url: `/pages/navigation/point/point-mall`,
+          uni.navigateTo({
+            url: `/pages/promotion/point/pointList`,
           });
           break;
       }