diff --git a/config/index.js b/config/index.js
index ade4699..153eca6 100644
--- a/config/index.js
+++ b/config/index.js
@@ -1,9 +1,8 @@
-
 // export const VUE_APP_API_URL = 'http://natapp.xinxintuan.co/api';
 // export const VUE_APP_API_URL = 'https://wxapi.yixiang.co/api';
 // export const VUE_APP_API_URL = 'http://192.168.31.223:8008/api';
- export const VUE_APP_API_URL = 'http://natapp.xinxintuan.co/api';
- // export const VUE_APP_API_URL = 'https://tapi.xinxintuan.co/api';
+//  export const VUE_APP_API_URL = 'http://natapp.xinxintuan.co/api';
+export const VUE_APP_API_URL = 'https://tapi.xinxintuan.co/api'
 //  export const VUE_APP_API_URL = 'https://h5api.xinxintuan.co/api';
 // export const VUE_APP_API_URL = 'https://h5api.xinxintuan.co/api';
-export const VUE_APP_RESOURCES_URL = 'https://wx.yixiang.co/static';
+export const VUE_APP_RESOURCES_URL = 'https://wx.yixiang.co/static'
diff --git a/pages.json b/pages.json
index 6bf8133..11102a0 100644
--- a/pages.json
+++ b/pages.json
@@ -1,460 +1,470 @@
 {
-	"pages": [ //pages数组中第一项表示应用启动页，参考：https://uniapp.dcloud.io/collocation/pages
-		{
-			"path": "pages/Loading/index",
-			"style": {
-				"navigationBarTitleText": "yshop商城"
-			}
-		},
-		{
-			"path": "pages/authorization/index",
-			"style": {
-				"navigationBarTitleText": "微信授权"
-			}
-		},
-		{
-			"path": "pages/user/Login/index",
-			"style": {
-				"navigationBarTitleText": "登录"
-			}
-		},
-		{
-			"path": "pages/user/Register/index",
-			"style": {
-				"navigationBarTitleText": "注册"
-			}
-		},
-		{
-			"path": "pages/user/RetrievePassword/index",
-			"style": {
-				"navigationBarTitleText": "重置密码"
-			}
-		},
-		{
-			"path": "pages/launch/index",
-			"style": {
-				"navigationBarTitleText": "首页"
-			}
-		},
-		{
-			"path": "pages/home/index",
-			"style": {
-				"navigationBarTitleText": "yshop商城",
-				"navigationBarTextStyle": "white",
-				// "enablePullDownRefresh": true,
-				"navigationStyle": "custom"
-			}
-		},
-		{
-			"path": "pages/shop/GoodSearch/index",
-			"style": {
-				"navigationBarTitleText": "搜索商品"
-			}
-		},
-		{
-			"path": "pages/shop/GoodsClass/index",
-			"style": {
-				"navigationBarTitleText": "商品分类"
-			}
-		},
-		{
-			"path": "pages/shop/ShoppingCart/index",
-			"style": {
-				"navigationBarTitleText": "购物车"
-			}
-		},
-		{
-			"path": "pages/shop/StoreList/index",
-			"style": {
-				"navigationBarTitleText": "商家列表"
-			}
-		},
-		{
-			"path": "pages/shop/GoodsList/index",
-			"style": {
-				"navigationBarTitleText": "商品列表"
-			}
-		},
-		{
-			"path": "pages/NotDefined/index",
-			"style": {
-				"navigationBarTitleText": "404"
-			}
-		},
-		{
-			"path": "pages/user/User/index",
-			"style": {
-				"navigationBarTitleText": "我的"
-			}
-		},
-		{
-			"path": "pages/shop/GoodsCollection/index",
-			"style": {
-				"navigationBarTitleText": "商品收藏"
-			}
-		},
-		{
-			"path": "pages/shop/GoodsFoot/index",
-			"style": {
-				"navigationBarTitleText": "我的足迹"
-			}
-		},
-		{
-			"path": "pages/shop/news/NewsDetail/index",
-			"style": {
-				"navigationBarTitleText": "新闻详情"
-			}
-		},
-		{
-			"path": "pages/shop/news/NewsList/index",
-			"style": {
-				"navigationBarTitleText": "新闻列表"
-			}
-		},
-		{
-			"path": "pages/shop/EvaluateList/index",
-			"style": {
-				"navigationBarTitleText": "评价列表"
-			}
-		},
-		{
-			"path": "pages/shop/GoodsEvaluate/index",
-			"style": {
-				"navigationBarTitleText": "商品评价"
-			}
-		},
-		{
-			"path": "pages/shop/GoodsPromotion/index",
-			"style": {
-				"navigationBarTitleText": "促销商品"
-			}
-		},
-		{
-			"path": "pages/shop/HotNewGoods/index",
-			"style": {
-				"navigationBarTitleText": "热门商品"
-			}
-		},
-		{
-			"path": "pages/shop/GoodsCon/index",
-			"style": {
-				"navigationBarTitleText": "商品详情"
-			}
-		},
-		{
-			"path": "pages/user/BindingPhone/index",
-			"style": {
-				"navigationBarTitleText": "绑定手机号"
-			}
-		},
-		{
-			"path": "pages/user/address/AddAddress/index",
-			"style": {
-				"navigationBarTitleText": "新增收货地址"
-			}
-		},
-		{
-			"path": "pages/user/UserAccount/index",
-			"style": {
-				"navigationBarTitleText": "账户余额"
-			}
-		},
-		{
-			"path": "pages/user/address/AddressManagement/index",
-			"style": {
-				"navigationBarTitleText": "收货地址"
-			}
-		},
-		{
-			"path": "pages/user/promotion/Poster/index",
-			"style": {
-				"navigationBarTitleText": "推广名片"
-			}
-		},
-		{
-			"path": "pages/user/signIn/Sign/index",
-			"style": {
-				"navigationBarTitleText": "签到"
-			}
-		},
-		{
-			"path": "pages/user/signIn/SignRecord/index",
-			"style": {
-				"navigationBarTitleText": "签到记录"
-			}
-		},
-		{
-			"path": "pages/user/promotion/CashAudit/index",
-			"style": {
-				"navigationBarTitleText": "提现结果"
-			}
-		},
-		{
-			"path": "pages/user/promotion/PromoterOrder/index",
-			"style": {
-				"navigationBarTitleText": "分销详情"
-			}
-		},
-		{
-			"path": "pages/user/promotion/PromoterList/index",
-			"style": {
-				"navigationBarTitleText": "分销列表"
-			}
-		},
-		{
-			"path": "pages/user/promotion/UserPromotion/index",
-			"style": {
-				"navigationBarTitleText": "佣金"
-			}
-		},
-		{
-			"path": "pages/user/UserBill/index",
-			"style": {
-				"navigationBarTitleText": "账单记录"
-			}
-		},
-		{
-			"path": "pages/user/promotion/CashRecord/index",
-			"style": {
-				"navigationBarTitleText": "提现记录"
-			}
-		},
-		{
-			"path": "pages/user/promotion/CommissionDetails/index",
-			"style": {
-				"navigationBarTitleText": "佣金明细"
-			}
-		},
-		{
-			"path": "pages/user/signIn/Integral/index",
-			"style": {
-				"navigationBarTitleText": "我的积分"
-			}
-		},
-		{
-			"path": "pages/user/UserVip/index",
-			"style": {
-				"navigationBarTitleText": "用户vip"
-			}
-		},
-		{
-			"path": "pages/user/PersonalData/index",
-			"style": {
-				"navigationBarTitleText": "个人资料"
-			}
-		},
-		{
-			"path": "pages/user/coupon/UserCoupon/index",
-			"style": {
-				"navigationBarTitleText": "优惠券"
-			}
-		},
-		{
-			"path": "pages/user/coupon/GetCoupon/index",
-			"style": {
-				"navigationBarTitleText": "领取优惠券"
-			}
-		},
-		{
-			"path": "pages/user/promotion/UserCash/index",
-			"style": {
-				"navigationBarTitleText": "提现"
-			}
-		},
-		{
-			"path": "pages/user/CustomerList/index",
-			"style": {
-				"navigationBarTitleText": "客服列表"
-			}
-		},
-		{
-			"path": "pages/user/Recharge/index",
-			"style": {
-				"navigationBarTitleText": "充值"
-			}
-		},
-		{
-			"path": "pages/order/MyOrder/index",
-			"style": {
-				"navigationBarTitleText": "我的订单"
-			}
-		},
-		{
-			"path": "pages/order/Logistics/index",
-			"style": {
-				"navigationBarTitleText": "查看物流"
-			}
-		},
-		{
-			"path": "pages/order/OrderDetails/index",
-			"style": {
-				"navigationBarTitleText": "订单详情"
-			}
-		},
-		{
-			"path": "pages/order/OrderSubmission/index",
-			"style": {
-				"navigationBarTitleText": "提交订单"
-			}
-		},
-		{
-			"path": "pages/order/PaymentStatus/index",
-			"style": {
-				"navigationBarTitleText": "支付状态"
-			}
-		},
-		{
-			"path": "pages/order/GoodsReturn/index",
-			"style": {
-				"navigationBarTitleText": "商品退货"
-			}
-		},
-		{
-			"path": "pages/order/ReturnList/index",
-			"style": {
-				"navigationBarTitleText": "退货列表"
-			}
-		},
-		{
-			"path": "pages/orderAdmin/OrderIndex/index",
-			"style": {
-				"navigationBarTitleText": "商家订单统计"
-			}
-		},
-		{
-			"path": "pages/orderAdmin/AdminOrderList/index",
-			"style": {
-				"navigationBarTitleText": "订单"
-			}
-		},
-		{
-			"path": "pages/orderAdmin/GoodsDeliver/index",
-			"style": {
-				"navigationBarTitleText": "发货"
-			}
-		},
-		{
-			"path": "pages/orderAdmin/AdminOrder/index",
-			"style": {
-				"navigationBarTitleText": "商家订单列表"
-			}
-		},
-		{
-			"path": "pages/orderAdmin/Statistics/index",
-			"style": {
-				"navigationBarTitleText": "商家统计数据"
-			}
-		},
-		{
-			"path": "pages/orderAdmin/OrderCancellation/index",
-			"style": {
-				"navigationBarTitleText": "商家核销订单"
-			}
-		},
-		{
-			"path": "pages/activity/Poster/index",
-			"style": {
-				"navigationBarTitleText": "推广海报"
-			}
-		},
-		{
-			"path": "pages/activity/DargainDetails/index",
-			"style": {
-				"navigationBarTitleText": "帮砍价"
-			}
-		},
-		{
-			"path": "pages/activity/GoodsBargain/index",
-			"style": {
-				"navigationBarTitleText": "砍价列表"
-			}
-		},
-		{
-			"path": "pages/activity/BargainRecord/index",
-			"style": {
-				"navigationBarTitleText": "砍价记录"
-			}
-		},
-		{
-			"path": "pages/activity/GoodsGroup/index",
-			"style": {
-				"navigationBarTitleText": "团购商品列表"
-			}
-		},
-		{
-			"path": "pages/activity/GroupDetails/index",
-			"style": {
-				"navigationBarTitleText": "团购商品详情"
-			}
-		},
-		{
-			"path": "pages/activity/GroupRule/index",
-			"style": {
-				"navigationBarTitleText": "团购规则"
-			}
-		},
-		{
-			"path": "pages/activity/GoodsSeckill/index",
-			"style": {
-				"navigationBarTitleText": "秒杀"
-			}
-		},
-		{
-			"path": "pages/activity/SeckillDetails/index",
-			"style": {
-				"navigationBarTitleText": "秒杀详情"
-			}
-		},
-		{
-			"path": "pages/map/index",
-			"style": {
-				"navigationBarTitleText": "地图"
-			}
-		},
-		{
-			"path": "pages/shop/Live/LiveList/index",
-			"style": {
-				"navigationBarTitleText": "直播列表"
-			}
-		}
-	],
-	"globalStyle": {
-		"navigationBarTextStyle": "black",
-		"navigationBarTitleText": "Yshop",
-		"navigationBarBackgroundColor": "#F8F8F8",
-		"backgroundColor": "#F8F8F8",
-		"navigationStyle": "default"
-
-	},
-	"tabBar": {
-		"color": "#282828",
-		"selectedColor": "#eb3729",
-		"borderStyle": "black",
-		"backgroundColor": "#ffffff",
-		"height": "50px",
-		"fontSize": "10px",
-		"iconWidth": "24px",
-		"spacing": "3px",
-		"list": [{
-			"pagePath": "pages/home/index",
-			"iconPath": "static/icon-home.png",
-			"selectedIconPath": "static/icon-home-hot.png",
-			"text": "首页"
-		}, {
-			"pagePath": "pages/shop/GoodsClass/index",
-			"iconPath": "static/icon-class.png",
-			"selectedIconPath": "static/icon-class-hot.png",
-			"text": "分类"
-		}, {
-			"pagePath": "pages/shop/ShoppingCart/index",
-			"iconPath": "static/icon-cart.png",
-			"selectedIconPath": "static/icon-cart-hot.png",
-			"text": "购物车"
-		}, {
-			"pagePath": "pages/user/User/index",
-			"iconPath": "static/icon-user.png",
-			"selectedIconPath": "static/icon-user-hot.png",
-			"text": "我的"
-		}]
-	}
+  "pages": [ //pages数组中第一项表示应用启动页，参考：https://uniapp.dcloud.io/collocation/pages
+    {
+      "path": "pages/Loading/index",
+      "style": {
+        "navigationBarTitleText": "yshop商城"
+      }
+    },
+    {
+      "path": "pages/authorization/index",
+      "style": {
+        "navigationBarTitleText": "微信授权"
+      }
+    },
+    {
+      "path": "pages/user/Login/index",
+      "style": {
+        "navigationBarTitleText": "登录"
+      }
+    },
+    {
+      "path": "pages/user/Register/index",
+      "style": {
+        "navigationBarTitleText": "注册"
+      }
+    },
+    {
+      "path": "pages/user/RetrievePassword/index",
+      "style": {
+        "navigationBarTitleText": "重置密码"
+      }
+    },
+    {
+      "path": "pages/launch/index",
+      "style": {
+        "navigationBarTitleText": "首页"
+      }
+    },
+    {
+      "path": "pages/home/index",
+      "style": {
+        "navigationBarTitleText": "yshop商城",
+        "navigationBarTextStyle": "white",
+        // "enablePullDownRefresh": true,
+        "navigationStyle": "custom"
+      }
+    },
+    {
+      "path": "pages/shop/GoodSearch/index",
+      "style": {
+        "navigationBarTitleText": "搜索商品"
+      }
+    },
+    {
+      "path": "pages/shop/GoodsClass/index",
+      "style": {
+        "navigationBarTitleText": "商品分类"
+      }
+    },
+    {
+      "path": "pages/shop/ShoppingCart/index",
+      "style": {
+        "navigationBarTitleText": "购物车"
+      }
+    },
+    {
+      "path": "pages/shop/StoreList/index",
+      "style": {
+        "navigationBarTitleText": "商家列表"
+      }
+    },
+    {
+      "path": "pages/shop/GoodsList/index",
+      "style": {
+        "navigationBarTitleText": "商品列表"
+      }
+    },
+    {
+      "path": "pages/NotDefined/index",
+      "style": {
+        "navigationBarTitleText": "404"
+      }
+    },
+    {
+      "path": "pages/user/User/index",
+      "style": {
+        "navigationBarTitleText": "我的"
+      }
+    },
+    {
+      "path": "pages/shop/GoodsCollection/index",
+      "style": {
+        "navigationBarTitleText": "商品收藏"
+      }
+    },
+    {
+      "path": "pages/shop/GoodsFoot/index",
+      "style": {
+        "navigationBarTitleText": "我的足迹"
+      }
+    },
+    {
+      "path": "pages/shop/news/NewsDetail/index",
+      "style": {
+        "navigationBarTitleText": "新闻详情"
+      }
+    },
+    {
+      "path": "pages/shop/news/NewsList/index",
+      "style": {
+        "navigationBarTitleText": "新闻列表"
+      }
+    },
+    {
+      "path": "pages/shop/EvaluateList/index",
+      "style": {
+        "navigationBarTitleText": "评价列表"
+      }
+    },
+    {
+      "path": "pages/shop/GoodsEvaluate/index",
+      "style": {
+        "navigationBarTitleText": "商品评价"
+      }
+    },
+    {
+      "path": "pages/shop/GoodsPromotion/index",
+      "style": {
+        "navigationBarTitleText": "促销商品"
+      }
+    },
+    {
+      "path": "pages/shop/HotNewGoods/index",
+      "style": {
+        "navigationBarTitleText": "热门商品"
+      }
+    },
+    {
+      "path": "pages/shop/GoodsCon/index",
+      "style": {
+        "navigationBarTitleText": "商品详情"
+      }
+    },
+    {
+      "path": "pages/shop/IntegralGoodsCon/index",
+      "style": {
+        "navigationBarTitleText": "积分商品详情"
+      }
+    },
+    {
+      "path": "pages/user/BindingPhone/index",
+      "style": {
+        "navigationBarTitleText": "绑定手机号"
+      }
+    },
+    {
+      "path": "pages/user/address/AddAddress/index",
+      "style": {
+        "navigationBarTitleText": "新增收货地址"
+      }
+    },
+    {
+      "path": "pages/user/UserAccount/index",
+      "style": {
+        "navigationBarTitleText": "账户余额"
+      }
+    },
+    {
+      "path": "pages/user/address/AddressManagement/index",
+      "style": {
+        "navigationBarTitleText": "收货地址"
+      }
+    },
+    {
+      "path": "pages/user/promotion/Poster/index",
+      "style": {
+        "navigationBarTitleText": "推广名片"
+      }
+    },
+    {
+      "path": "pages/user/signIn/Sign/index",
+      "style": {
+        "navigationBarTitleText": "签到"
+      }
+    },
+    {
+      "path": "pages/user/signIn/SignRecord/index",
+      "style": {
+        "navigationBarTitleText": "签到记录"
+      }
+    },
+    {
+      "path": "pages/user/promotion/CashAudit/index",
+      "style": {
+        "navigationBarTitleText": "提现结果"
+      }
+    },
+    {
+      "path": "pages/user/promotion/PromoterOrder/index",
+      "style": {
+        "navigationBarTitleText": "分销详情"
+      }
+    },
+    {
+      "path": "pages/user/promotion/PromoterList/index",
+      "style": {
+        "navigationBarTitleText": "分销列表"
+      }
+    },
+    {
+      "path": "pages/user/promotion/UserPromotion/index",
+      "style": {
+        "navigationBarTitleText": "佣金"
+      }
+    },
+    {
+      "path": "pages/user/UserBill/index",
+      "style": {
+        "navigationBarTitleText": "账单记录"
+      }
+    },
+    {
+      "path": "pages/user/promotion/CashRecord/index",
+      "style": {
+        "navigationBarTitleText": "提现记录"
+      }
+    },
+    {
+      "path": "pages/user/promotion/CommissionDetails/index",
+      "style": {
+        "navigationBarTitleText": "佣金明细"
+      }
+    },
+    {
+      "path": "pages/user/signIn/Integral/index",
+      "style": {
+        "navigationBarTitleText": "我的积分"
+      }
+    },
+    {
+      "path": "pages/user/UserVip/index",
+      "style": {
+        "navigationBarTitleText": "用户vip"
+      }
+    },
+    {
+      "path": "pages/user/PersonalData/index",
+      "style": {
+        "navigationBarTitleText": "个人资料"
+      }
+    },
+    {
+      "path": "pages/user/coupon/UserCoupon/index",
+      "style": {
+        "navigationBarTitleText": "优惠券"
+      }
+    },
+    {
+      "path": "pages/user/coupon/GetCoupon/index",
+      "style": {
+        "navigationBarTitleText": "领取优惠券"
+      }
+    },
+    {
+      "path": "pages/user/promotion/UserCash/index",
+      "style": {
+        "navigationBarTitleText": "提现"
+      }
+    },
+    {
+      "path": "pages/user/CustomerList/index",
+      "style": {
+        "navigationBarTitleText": "客服列表"
+      }
+    },
+    {
+      "path": "pages/user/Recharge/index",
+      "style": {
+        "navigationBarTitleText": "充值"
+      }
+    },
+    {
+      "path": "pages/order/MyOrder/index",
+      "style": {
+        "navigationBarTitleText": "我的订单"
+      }
+    },
+    {
+      "path": "pages/order/Logistics/index",
+      "style": {
+        "navigationBarTitleText": "查看物流"
+      }
+    },
+    {
+      "path": "pages/order/OrderDetails/index",
+      "style": {
+        "navigationBarTitleText": "订单详情"
+      }
+    },
+    {
+      "path": "pages/order/OrderSubmission/index",
+      "style": {
+        "navigationBarTitleText": "提交订单"
+      }
+    },
+    {
+      "path": "pages/order/PaymentStatus/index",
+      "style": {
+        "navigationBarTitleText": "支付状态"
+      }
+    },
+    {
+      "path": "pages/order/GoodsReturn/index",
+      "style": {
+        "navigationBarTitleText": "商品退货"
+      }
+    },
+    {
+      "path": "pages/order/ReturnList/index",
+      "style": {
+        "navigationBarTitleText": "退货列表"
+      }
+    },
+    {
+      "path": "pages/orderAdmin/OrderIndex/index",
+      "style": {
+        "navigationBarTitleText": "商家订单统计"
+      }
+    },
+    {
+      "path": "pages/orderAdmin/AdminOrderList/index",
+      "style": {
+        "navigationBarTitleText": "订单"
+      }
+    },
+    {
+      "path": "pages/orderAdmin/GoodsDeliver/index",
+      "style": {
+        "navigationBarTitleText": "发货"
+      }
+    },
+    {
+      "path": "pages/orderAdmin/AdminOrder/index",
+      "style": {
+        "navigationBarTitleText": "商家订单列表"
+      }
+    },
+    {
+      "path": "pages/orderAdmin/Statistics/index",
+      "style": {
+        "navigationBarTitleText": "商家统计数据"
+      }
+    },
+    {
+      "path": "pages/orderAdmin/OrderCancellation/index",
+      "style": {
+        "navigationBarTitleText": "商家核销订单"
+      }
+    },
+    {
+      "path": "pages/activity/Poster/index",
+      "style": {
+        "navigationBarTitleText": "推广海报"
+      }
+    },
+    {
+      "path": "pages/activity/DargainDetails/index",
+      "style": {
+        "navigationBarTitleText": "帮砍价"
+      }
+    },
+    {
+      "path": "pages/activity/GoodsBargain/index",
+      "style": {
+        "navigationBarTitleText": "砍价列表"
+      }
+    },
+    {
+      "path": "pages/activity/BargainRecord/index",
+      "style": {
+        "navigationBarTitleText": "砍价记录"
+      }
+    },
+    {
+      "path": "pages/activity/GoodsGroup/index",
+      "style": {
+        "navigationBarTitleText": "团购商品列表"
+      }
+    },
+    {
+      "path": "pages/activity/GroupDetails/index",
+      "style": {
+        "navigationBarTitleText": "团购商品详情"
+      }
+    },
+    {
+      "path": "pages/activity/GroupRule/index",
+      "style": {
+        "navigationBarTitleText": "团购规则"
+      }
+    },
+    {
+      "path": "pages/activity/GoodsSeckill/index",
+      "style": {
+        "navigationBarTitleText": "秒杀"
+      }
+    },
+    {
+      "path": "pages/activity/SeckillDetails/index",
+      "style": {
+        "navigationBarTitleText": "秒杀详情"
+      }
+    },
+    {
+      "path": "pages/map/index",
+      "style": {
+        "navigationBarTitleText": "地图"
+      }
+    },
+    {
+      "path": "pages/shop/Live/LiveList/index",
+      "style": {
+        "navigationBarTitleText": "直播列表"
+      }
+    }
+  ],
+  "globalStyle": {
+    "navigationBarTextStyle": "black",
+    "navigationBarTitleText": "Yshop",
+    "navigationBarBackgroundColor": "#F8F8F8",
+    "backgroundColor": "#F8F8F8",
+    "navigationStyle": "default"
+  },
+  "tabBar": {
+    "color": "#282828",
+    "selectedColor": "#eb3729",
+    "borderStyle": "black",
+    "backgroundColor": "#ffffff",
+    "height": "50px",
+    "fontSize": "10px",
+    "iconWidth": "24px",
+    "spacing": "3px",
+    "list": [
+      {
+        "pagePath": "pages/home/index",
+        "iconPath": "static/icon-home.png",
+        "selectedIconPath": "static/icon-home-hot.png",
+        "text": "首页"
+      },
+      {
+        "pagePath": "pages/shop/GoodsClass/index",
+        "iconPath": "static/icon-class.png",
+        "selectedIconPath": "static/icon-class-hot.png",
+        "text": "分类"
+      },
+      {
+        "pagePath": "pages/shop/ShoppingCart/index",
+        "iconPath": "static/icon-cart.png",
+        "selectedIconPath": "static/icon-cart-hot.png",
+        "text": "购物车"
+      },
+      {
+        "pagePath": "pages/user/User/index",
+        "iconPath": "static/icon-user.png",
+        "selectedIconPath": "static/icon-user-hot.png",
+        "text": "我的"
+      }
+    ]
+  }
 }
diff --git a/pages/order/OrderSubmission/index.vue b/pages/order/OrderSubmission/index.vue
index 96e1e74..284cd0c 100644
--- a/pages/order/OrderSubmission/index.vue
+++ b/pages/order/OrderSubmission/index.vue
@@ -2,10 +2,8 @@
   <view class="order-submission">
     <view class="allAddress" :style="systemStore ? '' : 'padding-top: 0.2*100rpx'">
       <view class="nav acea-row">
-        <view class="item font-color-red" :class="shipping_type === 0 ? 'on' : 'on2'" @click="addressType(0)"
-          v-if="systemStore"></view>
-        <view class="item font-color-red" :class="shipping_type === 1 ? 'on' : 'on2'" @click="addressType(1)"
-          v-if="systemStore"></view>
+        <view class="item font-color-red" :class="shipping_type === 0 ? 'on' : 'on2'" @click="addressType(0)" v-if="systemStore"></view>
+        <view class="item font-color-red" :class="shipping_type === 1 ? 'on' : 'on2'" @click="addressType(1)" v-if="systemStore && !isIntegral"></view>
       </view>
       <view class="address acea-row row-between-wrapper" v-if="shipping_type === 0" @click="addressTap">
         <view class="addressCon" v-if="addressInfo.realName">
@@ -15,7 +13,7 @@
           </view>
           <view>
             <text class="default font-color-red" v-if="addressInfo.isDefault">[默认]</text>
-            {{ addressInfo.province }}{{ addressInfo.city}}{{ addressInfo.district }}{{ addressInfo.detail }}
+            {{ addressInfo.province }}{{ addressInfo.city }}{{ addressInfo.district }}{{ addressInfo.detail }}
           </view>
         </view>
         <view class="addressCon" v-else>
@@ -27,14 +25,14 @@
         <div class="addressCon" v-if="storeItems">
           <div class="name">
             {{ storeItems.name }}
-            <span class="phone">{{storeItems.phone }}</span>
+            <span class="phone">{{ storeItems.phone }}</span>
           </div>
-          <div>{{ storeItems.address}}</div>
+          <div>{{ storeItems.address }}</div>
         </div>
         <div class="addressCon" v-else>
           <div class="name">
             {{ systemStore.name }}
-            <span class="phone">{{systemStore.phone}}</span>
+            <span class="phone">{{ systemStore.phone }}</span>
           </div>
           <div>{{ systemStore.address }}</div>
         </div>
@@ -46,10 +44,10 @@
     </view>
     <OrderGoods :evaluate="0" :isIntegral="isIntegral" :cartInfo="orderGroupInfo.cartInfo"></OrderGoods>
     <view class="wrapper">
-      <view class="item acea-row row-between-wrapper" @click="couponTap" v-if="deduction === false  && !isIntegral">
+      <view class="item acea-row row-between-wrapper" @click="couponTap" v-if="deduction === false && !isIntegral">
         <view>优惠券</view>
         <view class="discount">
-          {{ usableCoupon.couponTitle || "请选择" }}
+          {{ usableCoupon.couponTitle || '请选择' }}
           <text class="iconfont icon-jiantou"></text>
         </view>
       </view>
@@ -75,11 +73,7 @@
       <view class="item acea-row row-between-wrapper" v-if="shipping_type === 0">
         <view>快递费用</view>
         <view class="discount">
-          {{
-          orderGroupInfo.priceGroup.storePostage > 0
-          ? orderGroupInfo.priceGroup.storePostage
-          : "免运费"
-          }}
+          {{ orderGroupInfo.priceGroup.storePostage > 0 ? orderGroupInfo.priceGroup.storePostage : '免运费' }}
         </view>
       </view>
       <view v-if="shipping_type === 1">
@@ -105,32 +99,22 @@
       <view class="item">
         <view>支付方式</view>
         <view class="list">
-          <view class="payItem acea-row row-middle" v-if="!isIntegral" :class="active === 'weixin' ? 'on' : ''" @click="payItem('weixin')"
-            v-show="isWeixin">
-            <view class="name acea-row row-center-wrapper">
-              <view class="iconfont icon-weixin2" :class="active === 'weixin' ? 'bounceIn' : ''"></view>微信支付
-            </view>
+          <view class="payItem acea-row row-middle" v-if="!isIntegral" :class="active === 'weixin' ? 'on' : ''" @click="payItem('weixin')" v-show="isWeixin">
+            <view class="name acea-row row-center-wrapper"> <view class="iconfont icon-weixin2" :class="active === 'weixin' ? 'bounceIn' : ''"></view>微信支付 </view>
             <view class="tip">微信快捷支付</view>
           </view>
-          <view class="payItem acea-row row-middle" v-if="!isIntegral" :class="active === 'weixin' ? 'on' : ''" @click="payItem('weixin')"
-            v-show="!isWeixin">
-            <view class="name acea-row row-center-wrapper">
-              <view class="iconfont icon-weixin2" :class="active === 'weixin' ? 'bounceIn' : ''"></view>微信支付
-            </view>
+          <view class="payItem acea-row row-middle" v-if="!isIntegral" :class="active === 'weixin' ? 'on' : ''" @click="payItem('weixin')" v-show="!isWeixin">
+            <view class="name acea-row row-center-wrapper"> <view class="iconfont icon-weixin2" :class="active === 'weixin' ? 'bounceIn' : ''"></view>微信支付 </view>
             <view class="tip">微信快捷支付</view>
           </view>
           <view class="payItem acea-row row-middle" v-if="!isIntegral" :class="active === 'yue' ? 'on' : ''" @click="payItem('yue')">
-            <view class="name acea-row row-center-wrapper">
-              <view class="iconfont icon-icon-test" :class="active === 'yue' ? 'bounceIn' : ''"></view>余额支付
-            </view>
+            <view class="name acea-row row-center-wrapper"> <view class="iconfont icon-icon-test" :class="active === 'yue' ? 'bounceIn' : ''"></view>余额支付 </view>
             <view class="tip">可用余额：{{ userInfo.nowMoney || 0 }}</view>
           </view>
-		  <view class="payItem acea-row row-middle" :class="active === 'integral' ? 'on' : ''" @click="payItem('integral')">
-		    <view class="name acea-row row-center-wrapper">
-		      <view class="iconfont icon-icon-test" :class="active === 'integral' ? 'bounceIn' : ''"></view>积分支付
-		    </view>
-		    <view class="tip">可用积分：{{ userInfo.integral || 0 }}</view>
-		  </view>
+          <view class="payItem acea-row row-middle" :class="active === 'integral' ? 'on' : ''" @click="payItem('integral')">
+            <view class="name acea-row row-center-wrapper"> <view class="iconfont icon-icon-test" :class="active === 'integral' ? 'bounceIn' : ''"></view>积分支付 </view>
+            <view class="tip">可用积分：{{ userInfo.integral || 0 }}</view>
+          </view>
         </view>
       </view>
     </view>
@@ -140,11 +124,11 @@
         <view class="money" v-if="!isIntegral">￥{{ orderPrice.totalPrice }}</view>
         <view class="money" v-if="isIntegral">{{ orderPrice.payIntegral }}积分</view>
       </view>
-      <view class="item acea-row row-between-wrapper" v-if="orderPrice.payPostage > 0  && !isIntegral">
+      <view class="item acea-row row-between-wrapper" v-if="orderPrice.payPostage > 0 && !isIntegral">
         <view>运费：</view>
         <view class="money">￥{{ orderPrice.payPostage }}</view>
       </view>
-      <view class="item acea-row row-between-wrapper" v-if="orderPrice.couponPrice > 0  && !isIntegral">
+      <view class="item acea-row row-between-wrapper" v-if="orderPrice.couponPrice > 0 && !isIntegral">
         <view>优惠券抵扣：</view>
         <view class="money">-￥{{ orderPrice.couponPrice }}</view>
       </view>
@@ -153,7 +137,7 @@
         <view class="money">-￥{{ orderPrice.deductionPrice }}</view>
       </view>
     </view>
-    <view style="height:120rpx"></view>
+    <view style="height: 120rpx"></view>
     <view class="footer acea-row row-between-wrapper">
       <view>
         合计:
@@ -162,417 +146,396 @@
       </view>
       <view class="settlement" @click="createOrder">立即结算</view>
     </view>
-    <CouponListWindow v-on:couponchange="changecoupon($event)" v-model="showCoupon" :price="orderPrice.totalPrice"
-      :checked="usableCoupon.id" @checked="changeCoupon" :cartid="cartid"></CouponListWindow>
-    <AddressWindow @checked="changeAddress" @redirect="addressRedirect" v-model="showAddress" :checked="addressInfo.id"
-      ref="mychild"></AddressWindow>
+    <CouponListWindow v-on:couponchange="changecoupon($event)" v-model="showCoupon" :price="orderPrice.totalPrice" :checked="usableCoupon.id" @checked="changeCoupon" :cartid="cartid"></CouponListWindow>
+    <AddressWindow @checked="changeAddress" @redirect="addressRedirect" v-model="showAddress" :checked="addressInfo.id" ref="mychild"></AddressWindow>
   </view>
 </template>
 <style scoped lang="less">
-  .order-submission .wrapper .shipping select {
-    color: #999;
-    padding-right: 0.15 * 100rpx;
-  }
+.order-submission .wrapper .shipping select {
+  color: #999;
+  padding-right: 0.15 * 100rpx;
+}
 
-  .order-submission .wrapper .shipping .iconfont {
-    font-size: 0.3 * 100rpx;
-    color: #515151;
-  }
+.order-submission .wrapper .shipping .iconfont {
+  font-size: 0.3 * 100rpx;
+  color: #515151;
+}
 
-  .order-submission .allAddress {
-    width: 100%;
-    background-image: linear-gradient(to bottom, #eb3729 0%, #eb3729 100%);
-    background-image: -webkit-linear-gradient(to bottom,
-        #eb3729 0%,
-        #eb3729 100%);
-    background-image: -moz-linear-gradient(to bottom, #eb3729 0%, #eb3729 100%);
-    padding-top: 1 * 100rpx;
-  }
+.order-submission .allAddress {
+  width: 100%;
+  background-image: linear-gradient(to bottom, #eb3729 0%, #eb3729 100%);
+  background-image: -webkit-linear-gradient(to bottom, #eb3729 0%, #eb3729 100%);
+  background-image: -moz-linear-gradient(to bottom, #eb3729 0%, #eb3729 100%);
+  padding-top: 1 * 100rpx;
+}
 
-  .order-submission .allAddress .nav {
-    margin: 0 auto;
-    padding: 0 30rpx;
-    width: 100%;
-    box-sizing: border-box;
-  }
+.order-submission .allAddress .nav {
+  margin: 0 auto;
+  padding: 0 30rpx;
+  width: 100%;
+  box-sizing: border-box;
+}
 
-  .order-submission .allAddress .nav .item {
-    flex: 1;
-    position: relative;
-  }
+.order-submission .allAddress .nav .item {
+  flex: 1;
+  position: relative;
+}
 
-  .order-submission .allAddress .nav .item.on {
-    position: relative;
-  }
+.order-submission .allAddress .nav .item.on {
+  position: relative;
+}
 
-  .order-submission .allAddress .nav .item.on:before {
-    position: absolute;
-    bottom: 0;
-    content: "快递配送";
-    font-size: 0.28 * 100rpx;
-    display: block;
-    height: 0;
-    left: 0;
-    right: 0;
-    border-width: 0.4 * 100rpx;
-    border-style: solid;
-    border-color: #fff;
-    z-index: 9;
-    text-align: center;
-    line-height: 0.14 * 100rpx;
-  }
+.order-submission .allAddress .nav .item.on:before {
+  position: absolute;
+  bottom: 0;
+  content: '快递配送';
+  font-size: 0.28 * 100rpx;
+  display: block;
+  height: 0;
+  left: 0;
+  right: 0;
+  border-width: 0.4 * 100rpx;
+  border-style: solid;
+  border-color: #fff;
+  z-index: 9;
+  text-align: center;
+  line-height: 0.14 * 100rpx;
+}
 
-  .order-submission .allAddress .nav .item:nth-of-type(2).on:before {
-    content: "到店自提";
-    border-width: 0.4 * 100rpx;
-  }
+.order-submission .allAddress .nav .item:nth-of-type(2).on:before {
+  content: '到店自提';
+  border-width: 0.4 * 100rpx;
+}
 
-  .order-submission .allAddress .nav .item.on2 {
-    position: relative;
-  }
+.order-submission .allAddress .nav .item.on2 {
+  position: relative;
+}
 
-  .order-submission .allAddress .nav .item.on2:before {
-    position: absolute;
-    bottom: 0;
-    content: "到店自提";
-    font-size: 0.28 * 100rpx;
-    display: block;
-    height: 0;
-    left: 0;
-    right: 0;
-    border-width: 0.4 * 100rpx;
-    border-style: solid;
-    border-color: #d5e6e6;
-    text-align: center;
-    line-height: 0.14 * 100rpx;
-  }
+.order-submission .allAddress .nav .item.on2:before {
+  position: absolute;
+  bottom: 0;
+  content: '到店自提';
+  font-size: 0.28 * 100rpx;
+  display: block;
+  height: 0;
+  left: 0;
+  right: 0;
+  border-width: 0.4 * 100rpx;
+  border-style: solid;
+  border-color: #d5e6e6;
+  text-align: center;
+  line-height: 0.14 * 100rpx;
+}
 
-  .order-submission .allAddress .nav .item:nth-of-type(1).on2:before {
-    content: "快递配送";
-    border-width: 0.4 * 100rpx;
-  }
+.order-submission .allAddress .nav .item:nth-of-type(1).on2:before {
+  content: '快递配送';
+  border-width: 0.4 * 100rpx;
+}
 
-  .order-submission .allAddress .address {
-    width: 6.91 * 100rpx;
-    height: 1.5 * 100rpx;
-    margin: 0 auto;
-    box-sizing: border-box;
-  }
+.order-submission .allAddress .address {
+  width: 6.91 * 100rpx;
+  height: 1.5 * 100rpx;
+  margin: 0 auto;
+  box-sizing: border-box;
+}
 
-  .order-submission .allAddress .line {
-    width: 7.1 * 100rpx;
-    margin: 0 auto;
-  }
+.order-submission .allAddress .line {
+  width: 7.1 * 100rpx;
+  margin: 0 auto;
+}
 
-  .order-submission .wrapper .item .discount input::placeholder {
-    color: #ccc;
-  }
+.order-submission .wrapper .item .discount input::placeholder {
+  color: #ccc;
+}
 </style>
 <script>
-  import OrderGoods from "@/components/OrderGoods";
-  import CouponListWindow from "@/components/CouponListWindow";
-  import AddressWindow from "@/components/AddressWindow";
-  import {
-    postOrderConfirm,
-    postOrderComputed,
-    createOrder
-  } from "@/api/order";
-  import {
-    mapGetters
-  } from "vuex";
-  import {
-    handleOrderPayResults,
-    subscribeMessage
-  } from "@/libs/order";
-  import {
-    weappPay
-  } from "@/libs/wechat";
-  import {
-    isWeixin,
-    handleErrorMessage
-  } from "@/utils";
+import OrderGoods from '@/components/OrderGoods'
+import CouponListWindow from '@/components/CouponListWindow'
+import AddressWindow from '@/components/AddressWindow'
+import { postOrderConfirm, postOrderComputed, createOrder } from '@/api/order'
+import { mapGetters } from 'vuex'
+import { handleOrderPayResults, subscribeMessage } from '@/libs/order'
+import { weappPay } from '@/libs/wechat'
+import { isWeixin, handleErrorMessage } from '@/utils'
 
-  const NAME = "OrderSubmission",
-    _isWeixin = isWeixin();
-  export default {
-    name: NAME,
-    components: {
-      OrderGoods,
-      CouponListWindow,
-      AddressWindow,
-    },
-    props: {},
-    data: function () {
-      return {
-        offlinePayStatus: 2,
-        from: this.$deviceType,
-        deduction: true,
-        enableIntegral: true,
-        enableIntegralNum: 0,
-        isWeixin: _isWeixin,
-        pinkId: 0,
-        active: _isWeixin ? "weixin" : "yue",
-        showCoupon: false,
-        showAddress: false,
-        addressInfo: {},
-        couponId: 0,
-        orderGroupInfo: {
-          priceGroup: {},
-        },
-        usableCoupon: {},
-        addressLoaded: false,
-        useIntegral: false,
-        orderPrice: {
-          payPrice: "计算中",
-        },
-        mark: "",
-        systemStore: {},
-        shipping_type: 0,
-        contacts: "",
-        contactsTel: "",
-        storeSelfMention: 0,
-        cartid: "",
-        isIntegral: false
-      };
-    },
-    computed: mapGetters(["userInfo", "storeItems"]),
-    watch: {
-      useIntegral() {
-        this.computedPrice();
+const NAME = 'OrderSubmission',
+  _isWeixin = isWeixin()
+export default {
+  name: NAME,
+  components: {
+    OrderGoods,
+    CouponListWindow,
+    AddressWindow,
+  },
+  props: {},
+  data: function () {
+    return {
+      offlinePayStatus: 2,
+      from: this.$deviceType,
+      deduction: true,
+      enableIntegral: true,
+      enableIntegralNum: 0,
+      isWeixin: _isWeixin,
+      pinkId: 0,
+      active: _isWeixin ? 'weixin' : 'yue',
+      showCoupon: false,
+      showAddress: false,
+      addressInfo: {},
+      couponId: 0,
+      orderGroupInfo: {
+        priceGroup: {},
       },
-      $yroute(n) {
-        if (n.name === NAME) this.getCartInfo();
-      },
-      shipping_type() {
-        this.computedPrice();
+      usableCoupon: {},
+      addressLoaded: false,
+      useIntegral: false,
+      orderPrice: {
+        payPrice: '计算中',
       },
+      mark: '',
+      systemStore: {},
+      shipping_type: 0,
+      contacts: '',
+      contactsTel: '',
+      storeSelfMention: 0,
+      cartid: '',
+      isIntegral: false,
+    }
+  },
+  computed: mapGetters(['userInfo', 'storeItems']),
+  watch: {
+    useIntegral() {
+      this.computedPrice()
     },
-    onShow: function () {
-      let that = this;
-      this.$store.dispatch("getUser", true);
-      that.getCartInfo();
-      console.log(that.$yroute);
-      if (that.$yroute.query.pinkid !== undefined) {
-        that.pinkId = that.$yroute.query.pinkid;
-      }
-      this.isIntegral = that.$yroute.query.isIntegral == 'true'
-      this.useIntegral = this.isIntegral
-      if(this.isIntegral){
-        this.active='integral'
+    $yroute(n) {
+      if (n.name === NAME) this.getCartInfo()
+    },
+    shipping_type() {
+      this.computedPrice()
+    },
+  },
+  onShow: function () {
+    let that = this
+    this.$store.dispatch('getUser', true)
+    that.getCartInfo()
+    console.log(that.$yroute)
+    if (that.$yroute.query.pinkid !== undefined) {
+      that.pinkId = that.$yroute.query.pinkid
+    }
+    this.isIntegral = that.$yroute.query.isIntegral == 'true'
+    this.useIntegral = this.isIntegral
+    if (this.isIntegral) {
+      this.active = 'integral'
+    }
+    if (that.$yroute.query.id !== undefined) {
+      that.cartid = that.$yroute.query.id
+      console.log(that.cartid)
+    }
+  },
+  methods: {
+    showStoreList() {
+      this.$store.commit('get_to', 'orders')
+      this.$yrouter.push({
+        path: '/pages/shop/StoreList/index',
+      })
+    },
+    addressType: function (index) {
+      if (index && !this.systemStore.id) {
+        uni.showToast({
+          title: '暂无门店信息，您无法选择到店自提！',
+          icon: 'none',
+          duration: 2000,
+        })
+        return
       }
-      if (that.$yroute.query.id !== undefined) {
-        that.cartid = that.$yroute.query.id;
-        console.log(that.cartid);
+      console.log(this)
+      this.shipping_type = index
+    },
+    changeUseIntegral: function (e) {
+      // this.computedPrice();
+      if (this.isIntegral) {
+        return
       }
+      this.useIntegral = e.mp.detail.value[0]
     },
-    methods: {
-      showStoreList() {
-        this.$store.commit("get_to", "orders");
-        this.$yrouter.push({
-          path: "/pages/shop/StoreList/index",
-        });
-      },
-      addressType: function (index) {
-        if (index && !this.systemStore.id) {
+    computedPrice() {
+      let shipping_type = this.shipping_type
+      postOrderComputed(this.orderGroupInfo.orderKey, {
+        addressId: this.addressInfo.id,
+        useIntegral: this.useIntegral ? 1 : 0,
+        couponId: this.usableCoupon.id || 0,
+        shipping_type: parseInt(shipping_type) + 1,
+      }).then(res => {
+        const data = res.data
+        if (data.status === 'EXTEND_ORDER') {
+          this.$yrouter.replace({
+            path: '/pages/order/OrderDetails/index',
+            query: {
+              id: data.result.orderId,
+            },
+          })
+        } else {
+          this.orderPrice = data.result
+        }
+      })
+    },
+    getCartInfo() {
+      const cartIds = this.$yroute.query.id
+      if (!cartIds) {
+        uni.showToast({
+          title: '参数有误',
+          icon: 'none',
+          duration: 2000,
+        })
+        return this.$yrouter.back()
+      }
+      postOrderConfirm(cartIds)
+        .then(res => {
+          console.log(res, 999999)
+          console.log(res.data.systemStore || {}, 999999)
+          this.offlinePayStatus = res.data.offline_pay_status
+          this.orderGroupInfo = res.data
+          this.deduction = res.data.deduction
+          this.usableCoupon = res.data.usableCoupon || {}
+          this.addressInfo = res.data.addressInfo || {}
+          // 用来显示到店自提的店铺地址
+          this.systemStore = res.data.systemStore || {}
+          this.storeSelfMention = res.data.storeSelfMention
+          this.computedPrice()
+        })
+        .catch(() => {
           uni.showToast({
-            title: "暂无门店信息，您无法选择到店自提！",
-            icon: "none",
+            title: '加载订单数据失败',
+            icon: 'none',
             duration: 2000,
-          });
-          return;
+          })
+        })
+    },
+    addressTap: function () {
+      this.showAddress = true
+      if (!this.addressLoaded) {
+        this.addressLoaded = true
+        this.$refs.mychild.getAddressList()
+      }
+    },
+    addressRedirect() {
+      this.addressLoaded = false
+      this.showAddress = false
+    },
+    couponTap: function () {
+      this.showCoupon = true
+    },
+    changeCoupon: function (coupon) {
+      if (!coupon) {
+        this.usableCoupon = {
+          couponTitle: '不使用优惠券',
+          id: 0,
         }
-        console.log(this);
-        this.shipping_type = index;
-      },
-      changeUseIntegral: function (e) {
-        // this.computedPrice();
-        if (this.isIntegral) {
+      } else {
+        this.usableCoupon = coupon
+      }
+      this.computedPrice()
+    },
+    payItem: function (index) {
+      this.active = index
+    },
+    changeAddress(addressInfo) {
+      this.addressInfo = addressInfo
+      this.computedPrice()
+    },
+    createOrder() {
+      if (this.isIntegral) {
+        // 积分支付
+        if (this.userInfo.integral < this.orderPrice.payIntegral) {
+          uni.showToast({
+            title: '积分不足',
+            icon: 'none',
+            duration: 2000,
+          })
           return
         }
-        this.useIntegral = e.mp.detail.value[0];
-      },
-      computedPrice() {
-        let shipping_type = this.shipping_type;
-        postOrderComputed(this.orderGroupInfo.orderKey, {
-          addressId: this.addressInfo.id,
-          useIntegral: this.useIntegral ? 1 : 0,
-          couponId: this.usableCoupon.id || 0,
-          shipping_type: parseInt(shipping_type) + 1,
-        }).then((res) => {
-          const data = res.data;
-          if (data.status === "EXTEND_ORDER") {
-            this.$yrouter.replace({
-              path: "/pages/order/OrderDetails/index",
-              query: {
-                id: data.result.orderId,
-              },
-            });
-          } else {
-            this.orderPrice = data.result;
-          }
-        });
-      },
-      getCartInfo() {
-        const cartIds = this.$yroute.query.id;
-        if (!cartIds) {
+        this.active = 'integral'
+      }
+      let shipping_type = this.shipping_type
+      if (!this.isIntegral && !this.active) {
+        uni.showToast({
+          title: '请选择支付方式',
+          icon: 'none',
+          duration: 2000,
+        })
+        return
+      }
+      if (!this.addressInfo.id && !this.shipping_type) {
+        uni.showToast({
+          title: '请选择收货地址',
+          icon: 'none',
+          duration: 2000,
+        })
+        return
+      }
+
+      if (this.shipping_type) {
+        if ((this.contacts === '' || this.contactsTel === '') && this.shipping_type) {
           uni.showToast({
-            title: "参数有误",
-            icon: "none",
+            title: '请填写联系人或联系人电话',
+            icon: 'none',
             duration: 2000,
-          });
-          return this.$yrouter.back();
-        }
-        postOrderConfirm(cartIds)
-          .then((res) => {
-            console.log(res, 999999);
-            console.log(res.data.systemStore || {}, 999999);
-            this.offlinePayStatus = res.data.offline_pay_status;
-            this.orderGroupInfo = res.data;
-            this.deduction = res.data.deduction;
-            this.usableCoupon = res.data.usableCoupon || {};
-            this.addressInfo = res.data.addressInfo || {};
-            // 用来显示到店自提的店铺地址
-            this.systemStore = res.data.systemStore || {};
-            this.storeSelfMention = res.data.storeSelfMention;
-            this.computedPrice();
           })
-          .catch(() => {
-            uni.showToast({
-              title: "加载订单数据失败",
-              icon: "none",
-              duration: 2000,
-            });
-          });
-      },
-      addressTap: function () {
-        this.showAddress = true;
-        if (!this.addressLoaded) {
-          this.addressLoaded = true;
-          this.$refs.mychild.getAddressList();
-        }
-      },
-      addressRedirect() {
-        this.addressLoaded = false;
-        this.showAddress = false;
-      },
-      couponTap: function () {
-        this.showCoupon = true;
-      },
-      changeCoupon: function (coupon) {
-        if (!coupon) {
-          this.usableCoupon = {
-            couponTitle: "不使用优惠券",
-            id: 0,
-          };
-        } else {
-          this.usableCoupon = coupon;
-        }
-        this.computedPrice();
-      },
-      payItem: function (index) {
-        this.active = index;
-      },
-      changeAddress(addressInfo) {
-        this.addressInfo = addressInfo;
-        this.computedPrice();
-      },
-      createOrder() {
-        if (this.isIntegral) {
-          // 积分支付
-          if (this.userInfo.integral < this.orderPrice.payIntegral) {
-            uni.showToast({
-              title: "积分不足",
-              icon: "none",
-              duration: 2000,
-            });
-            return
-          }
-          this.active = 'integral'
+          return
         }
-        let shipping_type = this.shipping_type;
-        if (!this.isIntegral && !this.active) {
+
+        if (!/^1(3|4|5|7|8|9|6)\d{9}$/.test(this.contactsTel)) {
           uni.showToast({
-            title: "请选择支付方式",
-            icon: "none",
+            title: '请填写正确的手机号',
+            icon: 'none',
             duration: 2000,
-          });
-          return;
+          })
+          return
         }
-        if (!this.addressInfo.id && !this.shipping_type) {
+        if (!/^[\u4e00-\u9fa5\w]{2,16}$/.test(this.contacts)) {
           uni.showToast({
-            title: "请选择收货地址",
-            icon: "none",
+            title: '请填写您的真实姓名',
+            icon: 'none',
             duration: 2000,
-          });
-          return;
-        }
-
-        if (this.shipping_type) {
-          if (
-            (this.contacts === "" || this.contactsTel === "") &&
-            this.shipping_type
-          ) {
-            uni.showToast({
-              title: "请填写联系人或联系人电话",
-              icon: "none",
-              duration: 2000,
-            });
-            return;
-          }
-
-          if (!/^1(3|4|5|7|8|9|6)\d{9}$/.test(this.contactsTel)) {
-            uni.showToast({
-              title: "请填写正确的手机号",
-              icon: "none",
-              duration: 2000,
-            });
-            return;
-          }
-          if (!/^[\u4e00-\u9fa5\w]{2,16}$/.test(this.contacts)) {
-            uni.showToast({
-              title: "请填写您的真实姓名",
-              icon: "none",
-              duration: 2000,
-            });
-            return;
-          }
+          })
+          return
         }
+      }
 
-        uni.showLoading({
-          title: "生成订单中",
-        });
-        let from = {};
-        if (this.$deviceType == "app") {
-          from.from = "app";
-        }
-        // #ifdef MP-WEIXIN
-        subscribeMessage()
-        // #endif
-        createOrder(this.orderGroupInfo.orderKey, {
-            realName: this.contacts,
-            phone: this.contactsTel,
-            addressId: this.addressInfo.id,
-            useIntegral: this.useIntegral ? 1 : 0,
-            couponId: this.usableCoupon.id || 0,
-            payType: this.active,
-            pinkId: this.pinkId,
-            seckillId: this.orderGroupInfo.seckill_id,
-            combinationId: this.orderGroupInfo.combination_id,
-            bargainId: this.orderGroupInfo.bargain_id,
-            from: this.from,
-            mark: this.mark || "",
-            shippingType: parseInt(shipping_type) + 1,
-            storeId: this.storeItems ? this.storeItems.id : this.systemStore.id,
-            ...from,
-          })
-          .then((res) => {
-            uni.hideLoading();
-            handleOrderPayResults.call(this, res.data, "create", this.active);
-          })
-          .catch((err) => {
-            handleErrorMessage(err, "创建订单失败");
-          });
-      },
+      uni.showLoading({
+        title: '生成订单中',
+      })
+      let from = {}
+      if (this.$deviceType == 'app') {
+        from.from = 'app'
+      }
+      // #ifdef MP-WEIXIN
+      subscribeMessage()
+      // #endif
+      createOrder(this.orderGroupInfo.orderKey, {
+        realName: this.contacts,
+        phone: this.contactsTel,
+        addressId: this.addressInfo.id,
+        useIntegral: this.useIntegral ? 1 : 0,
+        couponId: this.usableCoupon.id || 0,
+        payType: this.active,
+        pinkId: this.pinkId,
+        seckillId: this.orderGroupInfo.seckill_id,
+        combinationId: this.orderGroupInfo.combination_id,
+        bargainId: this.orderGroupInfo.bargain_id,
+        from: this.from,
+        mark: this.mark || '',
+        shippingType: parseInt(shipping_type) + 1,
+        storeId: this.storeItems ? this.storeItems.id : this.systemStore.id,
+        ...from,
+      })
+        .then(res => {
+          uni.hideLoading()
+          handleOrderPayResults.call(this, res.data, 'create', this.active)
+        })
+        .catch(err => {
+          handleErrorMessage(err, '创建订单失败')
+        })
     },
-  };
+  },
+}
 </script>
diff --git a/pages/shop/GoodsCon/index.vue b/pages/shop/GoodsCon/index.vue
index 1e9c5ff..b0b776a 100644
--- a/pages/shop/GoodsCon/index.vue
+++ b/pages/shop/GoodsCon/index.vue
@@ -9,17 +9,12 @@
         <view class="share acea-row row-between row-bottom">
           <view class="money font-color-red" v-if="!isIntegral">
             <text>￥</text>
-            <text class="num">{{
-              attr.productSelect.price || storeInfo.price
-            }}</text>
-            <text class="vip-money"
-              v-if="storeInfo.vipPrice && storeInfo.vipPrice > 0">￥{{ attr.productSelect.vipPrice || storeInfo.vipPrice }}</text>
+            <text class="num">{{ attr.productSelect.price || storeInfo.price }}</text>
+            <text class="vip-money" v-if="storeInfo.vipPrice && storeInfo.vipPrice > 0">￥{{ attr.productSelect.vipPrice || storeInfo.vipPrice }}</text>
             <image src="@/static/images/vip.png" class="image" v-if="storeInfo.vipPrice && storeInfo.vipPrice > 0" />
           </view>
           <view class="money font-color-red" v-if="isIntegral">
-            <text class="num">{{
-              attr.productSelect.integral || storeInfo.integral
-            }}积分</text>
+            <text class="num">{{ attr.productSelect.integral || storeInfo.integral }}积分</text>
           </view>
           <view class="iconfont icon-fenxiang" @click="listenerActionSheet"></view>
         </view>
@@ -32,8 +27,7 @@
         <view class="coupon acea-row row-between-wrapper" @click="couponTap" v-if="couponList.length">
           <text class="hide line1">
             <text>优惠券：</text>
-            <text class="activity" v-for="(item, couponListEq) in couponList"
-              :key="couponListEq">满{{ item.useMinPrice }}减{{ item.couponPrice }}</text>
+            <text class="activity" v-for="(item, couponListEq) in couponList" :key="couponListEq">满{{ item.useMinPrice }}减{{ item.couponPrice }}</text>
           </text>
           <view class="iconfont icon-jiantou"></view>
         </view>
@@ -98,7 +92,7 @@
       </view>
 
       <!-- 商品推荐 -->
-      <view class="superior">
+      <!-- <view class="superior">
         <view class="title acea-row row-center-wrapper">
           <image src="@/static/images/ling.png" />
           <text class="titleTxt">优品推荐</text>
@@ -122,7 +116,7 @@
             </swiper>
           </view>
         </template>
-      </view>
+      </view> -->
 
       <!-- 商品详情 -->
       <view class="product-intro">
@@ -157,17 +151,13 @@
         </view>
         <view @click="goShoppingCart()" v-if="animated" class="item animated bounceIn">
           <view class="iconfont icon-gouwuche1">
-            <text class="num bg-color-red" v-if="CartCount > 0">{{
-              CartCount
-            }}</text>
+            <text class="num bg-color-red" v-if="CartCount > 0">{{ CartCount }}</text>
           </view>
           <text>购物车</text>
         </view>
         <view @click="goShoppingCart()" class="item animated" v-if="!animated">
           <view class="iconfont icon-gouwuche1">
-            <text class="num bg-color-red" v-if="CartCount > 0">{{
-              CartCount
-            }}</text>
+            <text class="num bg-color-red" v-if="CartCount > 0">{{ CartCount }}</text>
           </view>
           <text>购物车</text>
         </view>
@@ -186,8 +176,7 @@
       <!-- 商品规格弹窗 -->
       <ProductWindow :isIntegral="isIntegral" v-on:changeFun="changeFun" :attr="attr" :cartNum="cart_num"></ProductWindow>
       <!-- 分享海报 -->
-      <StorePoster v-on:setPosterImageStatus="setPosterImageStatus" :posterImageStatus="posterImageStatus"
-        :posterData="posterData" :goodId="id"></StorePoster>
+      <StorePoster v-on:setPosterImageStatus="setPosterImageStatus" :posterImageStatus="posterImageStatus" :posterData="posterData" :goodId="id"></StorePoster>
       <!-- 分享弹窗 -->
       <ShareInfo v-on:setShareInfoStatus="setShareInfoStatus" :shareInfoStatus="shareInfoStatus"></ShareInfo>
 
@@ -212,853 +201,788 @@
 </template>
 
 <script>
-  // import { swiper, swiperSlide } from "vue-awesome-swiper";
-
-  import ProductConSwiper from "@/components/ProductConSwiper";
-  import UserEvaluation from "@/components/UserEvaluation";
-  import CouponPop from "@/components/CouponPop";
-  import ProductWindow from "@/components/ProductWindow";
-  import StorePoster from "@/components/StorePoster";
-  import ShareInfo from "@/components/ShareInfo";
-  import {
-    getProductDetail,
-    postCartAdd,
-    getCartCount,
-    getProductCode,
-  } from "@/api/store";
-  import {
-    getCoupon,
-    getCollectAdd,
-    getCollectDel,
-    getUserInfo,
-  } from "@/api/user";
-  import cookie from "@/utils/store/cookie";
-  import {
-    isWeixin,
-    PosterCanvas,
-    handleQrCode,
-    handleUrlParam,
-    getCurrentPageUrlWithArgs,
-  } from "@/utils";
-  import {
-    wechatEvevt
-  } from "@/libs/wechat";
-  import {
-    imageBase64
-  } from "@/api/public";
-  import {
-    mapGetters
-  } from "vuex";
-
-  export default {
-    name: "GoodsCon",
-    components: {
-      // swiper,
-      // swiperSlide,
-      ProductConSwiper,
-      UserEvaluation,
-      CouponPop,
-      ProductWindow,
-      StorePoster,
-      ShareInfo,
+// import { swiper, swiperSlide } from "vue-awesome-swiper";
+
+import ProductConSwiper from '@/components/ProductConSwiper'
+import UserEvaluation from '@/components/UserEvaluation'
+import CouponPop from '@/components/CouponPop'
+import ProductWindow from '@/components/ProductWindow'
+import StorePoster from '@/components/StorePoster'
+import ShareInfo from '@/components/ShareInfo'
+import { getProductDetail, postCartAdd, getCartCount, getProductCode } from '@/api/store'
+import { getCoupon, getCollectAdd, getCollectDel, getUserInfo } from '@/api/user'
+import cookie from '@/utils/store/cookie'
+import { isWeixin, PosterCanvas, handleQrCode, handleUrlParam, getCurrentPageUrlWithArgs } from '@/utils'
+import { wechatEvevt } from '@/libs/wechat'
+import { imageBase64 } from '@/api/public'
+import { mapGetters } from 'vuex'
+
+export default {
+  name: 'GoodsCon',
+  components: {
+    // swiper,
+    // swiperSlide,
+    ProductConSwiper,
+    UserEvaluation,
+    CouponPop,
+    ProductWindow,
+    StorePoster,
+    ShareInfo,
+  },
+  data: function () {
+    return {
+      shareInfoStatus: false,
+      weixinStatus: false,
+      mapShow: false,
+      mapKey: '',
+      posterData: {
+        image: '',
+        title: '',
+        price: '',
+        code: '',
+      },
+      posterImageStatus: false,
+      animated: false,
+      coupon: {
+        coupon: false,
+        list: [],
+      },
+      attr: {
+        cartAttr: false,
+        productAttr: [],
+        productSelect: {},
+      },
+      isOpen: false, //是否打开属性组件
+      productValue: [],
+      id: 0,
+      storeInfo: {},
+      couponList: [],
+      attrTxt: '请选择',
+      attrValue: '',
+      cart_num: 1, //购买数量
+      replyCount: '',
+      replyChance: '',
+      reply: [],
+      priceName: 0,
+      CartCount: 0,
+      posters: false,
+      banner: [{}, {}],
+      swiperRecommend: {
+        pagination: {
+          el: '.swiper-pagination',
+          clickable: true,
+        },
+        autoplay: false,
+        loop: false,
+        speed: 1000,
+        observer: true,
+        observeParents: true,
+      },
+      goodList: [],
+      systemStore: {},
+      qqmapsdk: null,
+      productConClass: 'product-con',
+      tempName: '全国包邮',
+      isIntegral: false,
+    }
+  },
+  computed: mapGetters(['isLogin', 'location']),
+  mounted: function () {
+    this.$store.commit('get_to', 'goodcon')
+    let url = handleQrCode()
+    if (!url) {
+      url = handleUrlParam(getCurrentPageUrlWithArgs())
+    }
+    this.coupons()
+    if (url && url.id) {
+      this.id = url.id
+      let urlSpread = parseInt(url.spread)
+      if (urlSpread) {
+        cookie.set('spread', urlSpread)
+      }
+    } else {
+      this.id = this._route.query.id
+    }
+    this.isIntegral = url.isIntegral == 'true'
+    this.productCon()
+    this.setOpenShare()
+  },
+  watch: {
+    posterImageStatus(status) {
+      console.log(status)
+      if (status) {
+        this.productConClass = 'noscroll product-con'
+      } else {
+        this.productConClass = 'product-con'
+      }
     },
-    data: function () {
+  },
+  methods: {
+    onShareAppMessage: function () {
       return {
-        shareInfoStatus: false,
-        weixinStatus: false,
-        mapShow: false,
-        mapKey: "",
-        posterData: {
-          image: "",
-          title: "",
-          price: "",
-          code: "",
+        title: this.storeInfo.storeName,
+        imageUrl: this.storeInfo.image,
+        path: 'pages/shop/GoodsCon/index?id=' + this.storeInfo.id + '&spread=' + uni.getStorageSync('uid') + '&pageType=good&codeType=routine',
+        success(res) {
+          uni.showToast({
+            title: '分享成功',
+          })
         },
-        posterImageStatus: false,
-        animated: false,
-        coupon: {
-          coupon: false,
-          list: [],
+        fail(res) {
+          uni.showToast({
+            title: '分享失败',
+            icon: 'none',
+          })
         },
-        attr: {
-          cartAttr: false,
-          productAttr: [],
-          productSelect: {},
+      }
+    },
+    goHome() {
+      this.$yrouter.switchTab('/pages/home/index')
+    },
+    goShoppingCart() {
+      this.$yrouter.switchTab('/pages/shop/ShoppingCart/index')
+    },
+    goCustomerList() {
+      this.$yrouter.push({
+        path: '/pages/user/CustomerList/index',
+      })
+    },
+    goStoreList() {
+      this.$yrouter.push({
+        path: '/pages/shop/StoreList/index',
+      })
+    },
+    goEvaluateList(id) {
+      this.$yrouter.push({
+        path: '/pages/shop/EvaluateList/index',
+        query: {
+          id,
         },
-        isOpen: false, //是否打开属性组件
-        productValue: [],
-        id: 0,
-        storeInfo: {},
-        couponList: [],
-        attrTxt: "请选择",
-        attrValue: "",
-        cart_num: 1, //购买数量
-        replyCount: "",
-        replyChance: "",
-        reply: [],
-        priceName: 0,
-        CartCount: 0,
-        posters: false,
-        banner: [{}, {}],
-        swiperRecommend: {
-          pagination: {
-            el: ".swiper-pagination",
-            clickable: true,
-          },
-          autoplay: false,
-          loop: false,
-          speed: 1000,
-          observer: true,
-          observeParents: true,
+      })
+    },
+    telPhone(phoneNumber) {
+      uni.makePhoneCall({
+        phoneNumber: phoneNumber,
+        fail() {
+          console.log('取消拨打')
         },
-        goodList: [],
-        systemStore: {},
-        qqmapsdk: null,
-        productConClass: "product-con",
-        tempName: "全国包邮",
-        isIntegral: false
-      };
+      })
     },
-    computed: mapGetters(["isLogin", "location"]),
-    mounted: function () {
-      this.$store.commit("get_to", "goodcon");
-      let url = handleQrCode();
-      if (!url) {
-        url = handleUrlParam(getCurrentPageUrlWithArgs());
-      }
-      this.coupons();
-      if (url && url.id) {
-        this.id = url.id;
-        let urlSpread = parseInt(url.spread);
-        if (urlSpread) {
-          cookie.set("spread", urlSpread);
-        }
-      } else {
-        this.id = this._route.query.id;
-      }
-      this.isIntegral = url.isIntegral == 'true'
-      this.productCon();
-      this.setOpenShare();
+    showChang: function (data) {
+      this.$yrouter.push({
+        path: '/pages/map/index',
+        query: data,
+      })
     },
-    watch: {
-      posterImageStatus(status) {
-        console.log(status);
-        if (status) {
-          this.productConClass = "noscroll product-con";
-        } else {
-          this.productConClass = "product-con";
-        }
-      },
+    updateTitle() {
+      // document.title = this.storeInfo.storeName || this.$yroute.meta.title;
     },
-    methods: {
-      onShareAppMessage: function () {
-        return {
-          title: this.storeInfo.storeName,
-          imageUrl: this.storeInfo.image,
-          path: "pages/shop/GoodsCon/index?id=" +
-            this.storeInfo.id +
-            "&spread=" +
-            uni.getStorageSync("uid") +
-            "&pageType=good&codeType=routine",
-          success(res) {
-            uni.showToast({
-              title: "分享成功",
-            });
-          },
-          fail(res) {
-            uni.showToast({
-              title: "分享失败",
-              icon: "none",
-            });
-          },
-        };
-      },
-      goHome() {
-        this.$yrouter.switchTab("/pages/home/index");
-      },
-      goShoppingCart() {
-        this.$yrouter.switchTab("/pages/shop/ShoppingCart/index");
-      },
-      goCustomerList() {
-        this.$yrouter.push({
-          path: "/pages/user/CustomerList/index",
-        });
-      },
-      goStoreList() {
-        this.$yrouter.push({
-          path: "/pages/shop/StoreList/index",
-        });
-      },
-      goEvaluateList(id) {
-        this.$yrouter.push({
-          path: "/pages/shop/EvaluateList/index",
-          query: {
-            id,
-          },
-        });
-      },
-      telPhone(phoneNumber) {
-        uni.makePhoneCall({
-          phoneNumber: phoneNumber,
-          fail() {
-            console.log("取消拨打");
-          },
-        });
-      },
-      showChang: function (data) {
-        this.$yrouter.push({
-          path: "/pages/map/index",
-          query: data,
-        });
-      },
-      updateTitle() {
-        // document.title = this.storeInfo.storeName || this.$yroute.meta.title;
-      },
-      setShareInfoStatus: function () {
-        this.shareInfoStatus = !this.shareInfoStatus;
-        this.posters = false;
-      },
-      shareCode: function () {
-        var that = this;
-        getProductCode(that.id).then((res) => {
-          that.posterData.code = res.data.code;
-          that.listenerActionSheet();
-        });
-      },
-      setPosterImageStatus: function () {
-        this.posterImageStatus = !this.posterImageStatus;
-        this.posters = false;
-      },
-      //产品详情接口；
-      productCon: function () {
-        let that = this;
-        let from = this.location;
-        if (this.$deviceType == "app") {
-          from.from = "app";
-        }
-        uni.showLoading({
-          title: "加载中",
-          mask: true,
-        });
-        getProductDetail(that.id, from)
-          .then((res) => {
-            res.data.storeInfo.description = res.data.storeInfo.description.replace(
-              /\<img/gi,
-              '<img style="max-width:100%;height:auto;"'
-            );
-            that.$set(that, "storeInfo", res.data.storeInfo);
-            // 给 attr 赋值，将请求回来的规格赋值给 attr
-            that.$set(that.attr, "productAttr", res.data.productAttr);
-            that.$set(that, "productValue", res.data.productValue);
-            that.$set(that, "replyCount", res.data.replyCount);
-            that.$set(that, "replyChance", res.data.replyChance);
-            that.reply = res.data.reply ? [res.data.reply] : [];
-            that.$set(that, "reply", that.reply);
-            that.$set(that, "priceName", res.data.priceName);
-            that.$set(that, "tempName", res.data.tempName);
-            that.posterData.image = that.storeInfo.image;
-            if (that.storeInfo.storeName.length > 30) {
-              that.posterData.title =
-                that.storeInfo.storeName.substring(0, 30) + "...";
-            } else {
-              that.posterData.title = that.storeInfo.storeName;
-            }
-            that.posterData.price = that.storeInfo.price;
-            that.posterData.code = that.storeInfo.codeBase;
-            that.systemStore = res.data.systemStore;
-            let good_list = res.data.goodList || [];
-            let goodArray = [];
-            let count = Math.ceil(good_list.length / 6);
-            for (let i = 0; i < count; i++) {
-              var list = good_list.slice(i * 6, 6);
-              if (list.length)
-                goodArray.push({
-                  list: list,
-                });
-            }
-            that.mapKay = res.data.mapKay;
-            that.$set(that, "goodList", goodArray);
-            that.updateTitle();
-            that.DefaultSelect();
-            that.getCartCount();
-          })
-          .catch((err) => {
-            uni.showToast({
-              title: err.msg || err.response.data.msg || err.response.data.message,
-              icon: "none",
-              duration: 2000,
-            });
-          })
-          .finally(() => {
-            uni.hideLoading();
-          });
-      },
-      //默认选中属性；
-      DefaultSelect: function () {
-        let productAttr = this.attr.productAttr;
-        let value = [];
-        for (let i = 0; i < productAttr.length; i++) {
-          this.$set(productAttr[i], "index", 0);
-          value.push(productAttr[i].attrValueArr[0]);
-        }
-        //sort();排序函数:数字-英文-汉字；
-        let productSelect = this.productValue[value.sort().join(",")];
-        if (productSelect && productAttr.length) {
-          this.$set(
-            this.attr.productSelect,
-            "store_name",
-            this.storeInfo.storeName
-          );
-          this.$set(this.attr.productSelect, "image", productSelect.image);
-          this.$set(this.attr.productSelect, "price", productSelect.price);
-          this.$set(this.attr.productSelect, "stock", productSelect.stock);
-          this.$set(this.attr.productSelect, "unique", productSelect.unique);
-          this.$set(this.attr.productSelect, "integral", productSelect.integral);
-          this.$set(this.attr.productSelect, "cart_num", 1);
-          this.$set(this, "attrValue", value.sort().join(","));
-          this.$set(this, "attrTxt", "已选择");
-        } else if (!productSelect && productAttr.length) {
-          this.$set(
-            this.attr.productSelect,
-            "store_name",
-            this.storeInfo.storeName
-          );
-          this.$set(this.attr.productSelect, "image", this.storeInfo.image);
-          this.$set(this.attr.productSelect, "price", this.storeInfo.price);
-          this.$set(this.attr.productSelect, "integral", this.storeInfo.integral);
-          this.$set(this.attr.productSelect, "stock", 0);
-          this.$set(this.attr.productSelect, "unique", "");
-          this.$set(this.attr.productSelect, "cart_num", 0);
-          this.$set(this, "attrValue", "");
-          this.$set(this, "attrTxt", "请选择");
-        } else if (!productSelect && !productAttr.length) {
-          this.$set(
-            this.attr.productSelect,
-            "store_name",
-            this.storeInfo.storeName
-          );
-          this.$set(this.attr.productSelect, "image", this.storeInfo.image);
-          this.$set(this.attr.productSelect, "price", this.storeInfo.price);
-          this.$set(this.attr.productSelect, "stock", this.storeInfo.stock);
-          this.$set(this.attr.productSelect, "integral", this.storeInfo.integral);
-          this.$set(
-            this.attr.productSelect,
-            "unique",
-            this.storeInfo.unique || ""
-          );
-          this.$set(this.attr.productSelect, "cart_num", 1);
-          this.$set(this, "attrValue", "");
-          this.$set(this, "attrTxt", "请选择");
-        }
-      },
-      //购物车；
-      ChangeCartNum: function (changeValue) {
-        //changeValue:是否 加|减
-        //获取当前变动属性
-        let productSelect = this.productValue[this.attrValue];
-        //如果没有属性,赋值给商品默认库存
-        if (productSelect === undefined && !this.attr.productAttr.length) {
-          productSelect = this.attr.productSelect;
-        }
-        //无属性值即库存为0；不存在加减；
-        if (productSelect === undefined) return;
-        let stock = productSelect.stock || 0;
-        let num = this.attr.productSelect;
-        if (changeValue) {
-          num.cart_num++;
-          if (num.cart_num > stock) {
-            this.$set(this.attr.productSelect, "cart_num", stock);
-            this.$set(this, "cart_num", stock);
+    setShareInfoStatus: function () {
+      this.shareInfoStatus = !this.shareInfoStatus
+      this.posters = false
+    },
+    shareCode: function () {
+      var that = this
+      getProductCode(that.id).then(res => {
+        that.posterData.code = res.data.code
+        that.listenerActionSheet()
+      })
+    },
+    setPosterImageStatus: function () {
+      this.posterImageStatus = !this.posterImageStatus
+      this.posters = false
+    },
+    //产品详情接口；
+    productCon: function () {
+      let that = this
+      let from = this.location
+      if (this.$deviceType == 'app') {
+        from.from = 'app'
+      }
+      uni.showLoading({
+        title: '加载中',
+        mask: true,
+      })
+      getProductDetail(that.id, from)
+        .then(res => {
+          res.data.storeInfo.description = res.data.storeInfo.description.replace(/\<img/gi, '<img style="max-width:100%;height:auto;"')
+          that.$set(that, 'storeInfo', res.data.storeInfo)
+          // 给 attr 赋值，将请求回来的规格赋值给 attr
+          that.$set(that.attr, 'productAttr', res.data.productAttr)
+          that.$set(that, 'productValue', res.data.productValue)
+          that.$set(that, 'replyCount', res.data.replyCount)
+          that.$set(that, 'replyChance', res.data.replyChance)
+          that.reply = res.data.reply ? [res.data.reply] : []
+          that.$set(that, 'reply', that.reply)
+          that.$set(that, 'priceName', res.data.priceName)
+          that.$set(that, 'tempName', res.data.tempName)
+          that.posterData.image = that.storeInfo.image
+          if (that.storeInfo.storeName.length > 30) {
+            that.posterData.title = that.storeInfo.storeName.substring(0, 30) + '...'
           } else {
-            this.$set(this.attr.productSelect, "cart_num", num.cart_num);
-            this.$set(this, "cart_num", num.cart_num);
+            that.posterData.title = that.storeInfo.storeName
           }
-        } else {
-          num.cart_num--;
-          if (num.cart_num < 1) {
-            this.$set(this.attr.productSelect, "cart_num", 1);
-            this.$set(this, "cart_num", 1);
-          } else {
-            this.$set(this.attr.productSelect, "cart_num", num.cart_num);
-            this.$set(this, "cart_num", num.cart_num);
+          that.posterData.price = that.storeInfo.price
+          that.posterData.code = that.storeInfo.codeBase
+          that.systemStore = res.data.systemStore
+          let good_list = res.data.goodList || []
+          let goodArray = []
+          let count = Math.ceil(good_list.length / 6)
+          for (let i = 0; i < count; i++) {
+            var list = good_list.slice(i * 6, 6)
+            if (list.length)
+              goodArray.push({
+                list: list,
+              })
           }
-        }
-      },
-      //将父级向子集多次传送的函数合二为一；
-      changeFun: function (opt) {
-        if (typeof opt !== "object") opt = {};
-        let action = opt.action || "";
-        let value = opt.value === undefined ? "" : opt.value;
-        this[action] && this[action](value);
-      },
-      //打开优惠券插件；
-      couponTap: function () {
-        let that = this;
-        that.coupons();
-        that.coupon.coupon = true;
-      },
-      changecoupon: function (msg) {
-        this.coupon.coupon = msg;
-        this.coupons();
-      },
-      currentcoupon: function (res) {
-        let that = this;
-        that.coupon.coupon = false;
-        that.$set(that.coupon.list[res], "is_use", true);
-      },
-      //可领取优惠券接口；
-      coupons: function () {
-        let that = this,
-          q = {
-            page: 1,
-            limit: 20,
-          };
-        getCoupon(q).then((res) => {
-          that.$set(that, "couponList", res.data || []);
-          that.$set(that.coupon, "list", res.data);
-        });
-      },
-      //打开属性插件；
-      selecAttrTap: function () {
-        this.attr.cartAttr = true;
-        this.isOpen = true;
-      },
-      changeattr: function (msg) {
-        // 修改了规格
-        console.log(msg);
-        this.attr.cartAttr = msg;
-        this.isOpen = false;
-      },
-      //选择属性；
-      ChangeAttr: function (res) {
-        // 修改了规格
-
-        let productSelect = this.productValue[res.value];
-        console.log(productSelect);
-        if (productSelect) {
-          this.attr.productAttr[res.indexw].index = res.indexn;
-          this.$set(this.attr.productSelect, "image", productSelect.image);
-          this.$set(this.attr.productSelect, "price", productSelect.price);
-          this.$set(this.attr.productSelect, "stock", productSelect.stock);
-          this.$set(this.attr.productSelect, "unique", productSelect.unique);
-          this.$set(this.attr.productSelect, "integral", productSelect.integral);
-          this.$set(this.attr.productSelect, "cart_num", 1);
-          this.$set(this, "attrValue", res.value);
-          this.$set(this, "attrTxt", "已选择");
-        } else {
-          this.$set(this.attr.productSelect, "image", this.storeInfo.image);
-          this.$set(this.attr.productSelect, "price", this.storeInfo.price);
-          this.$set(this.attr.productSelect, "integral", this.storeInfo.price);
-          this.$set(this.attr.productSelect, "stock", 0);
-          this.$set(this.attr.productSelect, "unique", "");
-          this.$set(this.attr.productSelect, "cart_num", 0);
-          this.$set(this, "attrValue", "");
-          this.$set(this, "attrTxt", "请选择");
-        }
-      },
-      //收藏商品
-      setCollect: function () {
-        let that = this,
-          id = that.storeInfo.id,
-          category = "collect";
-        if (that.storeInfo.userCollect) {
-          getCollectDel(id, category).then(function () {
-            that.storeInfo.userCollect = !that.storeInfo.userCollect;
-          });
+          that.mapKay = res.data.mapKay
+          that.$set(that, 'goodList', goodArray)
+          that.updateTitle()
+          that.DefaultSelect()
+          that.getCartCount()
+        })
+        .catch(err => {
+          uni.showToast({
+            title: err.msg || err.response.data.msg || err.response.data.message,
+            icon: 'none',
+            duration: 2000,
+          })
+        })
+        .finally(() => {
+          uni.hideLoading()
+        })
+    },
+    //默认选中属性；
+    DefaultSelect: function () {
+      let productAttr = this.attr.productAttr
+      let value = []
+      for (let i = 0; i < productAttr.length; i++) {
+        this.$set(productAttr[i], 'index', 0)
+        value.push(productAttr[i].attrValueArr[0])
+      }
+      //sort();排序函数:数字-英文-汉字；
+      let productSelect = this.productValue[value.sort().join(',')]
+      if (productSelect && productAttr.length) {
+        this.$set(this.attr.productSelect, 'store_name', this.storeInfo.storeName)
+        this.$set(this.attr.productSelect, 'image', productSelect.image)
+        this.$set(this.attr.productSelect, 'price', productSelect.price)
+        this.$set(this.attr.productSelect, 'stock', productSelect.stock)
+        this.$set(this.attr.productSelect, 'unique', productSelect.unique)
+        this.$set(this.attr.productSelect, 'integral', productSelect.integral)
+        this.$set(this.attr.productSelect, 'cart_num', 1)
+        this.$set(this, 'attrValue', value.sort().join(','))
+        this.$set(this, 'attrTxt', '已选择')
+      } else if (!productSelect && productAttr.length) {
+        this.$set(this.attr.productSelect, 'store_name', this.storeInfo.storeName)
+        this.$set(this.attr.productSelect, 'image', this.storeInfo.image)
+        this.$set(this.attr.productSelect, 'price', this.storeInfo.price)
+        this.$set(this.attr.productSelect, 'integral', this.storeInfo.integral)
+        this.$set(this.attr.productSelect, 'stock', 0)
+        this.$set(this.attr.productSelect, 'unique', '')
+        this.$set(this.attr.productSelect, 'cart_num', 0)
+        this.$set(this, 'attrValue', '')
+        this.$set(this, 'attrTxt', '请选择')
+      } else if (!productSelect && !productAttr.length) {
+        this.$set(this.attr.productSelect, 'store_name', this.storeInfo.storeName)
+        this.$set(this.attr.productSelect, 'image', this.storeInfo.image)
+        this.$set(this.attr.productSelect, 'price', this.storeInfo.price)
+        this.$set(this.attr.productSelect, 'stock', this.storeInfo.stock)
+        this.$set(this.attr.productSelect, 'integral', this.storeInfo.integral)
+        this.$set(this.attr.productSelect, 'unique', this.storeInfo.unique || '')
+        this.$set(this.attr.productSelect, 'cart_num', 1)
+        this.$set(this, 'attrValue', '')
+        this.$set(this, 'attrTxt', '请选择')
+      }
+    },
+    //购物车；
+    ChangeCartNum: function (changeValue) {
+      //changeValue:是否 加|减
+      //获取当前变动属性
+      let productSelect = this.productValue[this.attrValue]
+      //如果没有属性,赋值给商品默认库存
+      if (productSelect === undefined && !this.attr.productAttr.length) {
+        productSelect = this.attr.productSelect
+      }
+      //无属性值即库存为0；不存在加减；
+      if (productSelect === undefined) return
+      let stock = productSelect.stock || 0
+      let num = this.attr.productSelect
+      if (changeValue) {
+        num.cart_num++
+        if (num.cart_num > stock) {
+          this.$set(this.attr.productSelect, 'cart_num', stock)
+          this.$set(this, 'cart_num', stock)
         } else {
-          getCollectAdd(id, category).then(function () {
-            that.storeInfo.userCollect = !that.storeInfo.userCollect;
-          });
+          this.$set(this.attr.productSelect, 'cart_num', num.cart_num)
+          this.$set(this, 'cart_num', num.cart_num)
         }
-      },
-      //  点击加入购物车按钮
-      joinCart: function () {
-        //0=加入购物车
-        this.goCat(0);
-      },
-      // 加入购物车；
-      goCat: function (news) {
-        let that = this,
-          productSelect = that.productValue[this.attrValue];
-        //打开属性
-        if (that.attrValue) {
-          //默认选中了属性，但是没有打开过属性弹窗还是自动打开让用户查看默认选中的属性
-          that.attr.cartAttr = !that.isOpen ? true : false;
+      } else {
+        num.cart_num--
+        if (num.cart_num < 1) {
+          this.$set(this.attr.productSelect, 'cart_num', 1)
+          this.$set(this, 'cart_num', 1)
         } else {
-          if (that.isOpen) that.attr.cartAttr = true;
-          else that.attr.cartAttr = !that.attr.cartAttr;
+          this.$set(this.attr.productSelect, 'cart_num', num.cart_num)
+          this.$set(this, 'cart_num', num.cart_num)
         }
-        //只有关闭属性弹窗时进行加入购物车
-        if (that.attr.cartAttr === true && that.isOpen === false)
-          return (that.isOpen = true);
-        //如果有属性,没有选择,提示用户选择
-        if (
-          that.attr.productAttr.length &&
-          productSelect === undefined &&
-          that.isOpen === true
-        ) {
-          uni.showToast({
-            title: "产品库存不足，请选择其它",
-            icon: "none",
-            duration: 2000,
-          });
-          return;
+      }
+    },
+    //将父级向子集多次传送的函数合二为一；
+    changeFun: function (opt) {
+      if (typeof opt !== 'object') opt = {}
+      let action = opt.action || ''
+      let value = opt.value === undefined ? '' : opt.value
+      this[action] && this[action](value)
+    },
+    //打开优惠券插件；
+    couponTap: function () {
+      let that = this
+      that.coupons()
+      that.coupon.coupon = true
+    },
+    changecoupon: function (msg) {
+      this.coupon.coupon = msg
+      this.coupons()
+    },
+    currentcoupon: function (res) {
+      let that = this
+      that.coupon.coupon = false
+      that.$set(that.coupon.list[res], 'is_use', true)
+    },
+    //可领取优惠券接口；
+    coupons: function () {
+      let that = this,
+        q = {
+          page: 1,
+          limit: 20,
         }
-        let q = {
-          productId: that.id,
-          cartNum: that.attr.productSelect.cart_num,
-          new: news,
-          uniqueId: that.attr.productSelect !== undefined ?
-            that.attr.productSelect.unique : "",
-        };
-        postCartAdd(q)
-          .then(function (res) {
-            console.log(res)
-            that.isOpen = false;
-            that.attr.cartAttr = false;
-            if (news) {
-              if (!res.data) {
-                uni.showToast({
-                  title: res.msg || res.data.msg || res.data.message,
-                  icon: "none",
-                  duration: 2000,
-                });
-                return;
-              }
-              that.$yrouter.push({
-                path: "/pages/order/OrderSubmission/index",
-                query: {
-                  id: res.data.cartId,
-                  isIntegral:that.isIntegral
-                },
-              });
-            } else {
+      getCoupon(q).then(res => {
+        that.$set(that, 'couponList', res.data || [])
+        that.$set(that.coupon, 'list', res.data)
+      })
+    },
+    //打开属性插件；
+    selecAttrTap: function () {
+      this.attr.cartAttr = true
+      this.isOpen = true
+    },
+    changeattr: function (msg) {
+      // 修改了规格
+      console.log(msg)
+      this.attr.cartAttr = msg
+      this.isOpen = false
+    },
+    //选择属性；
+    ChangeAttr: function (res) {
+      // 修改了规格
+
+      let productSelect = this.productValue[res.value]
+      console.log(productSelect)
+      if (productSelect) {
+        this.attr.productAttr[res.indexw].index = res.indexn
+        this.$set(this.attr.productSelect, 'image', productSelect.image)
+        this.$set(this.attr.productSelect, 'price', productSelect.price)
+        this.$set(this.attr.productSelect, 'stock', productSelect.stock)
+        this.$set(this.attr.productSelect, 'unique', productSelect.unique)
+        this.$set(this.attr.productSelect, 'integral', productSelect.integral)
+        this.$set(this.attr.productSelect, 'cart_num', 1)
+        this.$set(this, 'attrValue', res.value)
+        this.$set(this, 'attrTxt', '已选择')
+      } else {
+        this.$set(this.attr.productSelect, 'image', this.storeInfo.image)
+        this.$set(this.attr.productSelect, 'price', this.storeInfo.price)
+        this.$set(this.attr.productSelect, 'integral', this.storeInfo.price)
+        this.$set(this.attr.productSelect, 'stock', 0)
+        this.$set(this.attr.productSelect, 'unique', '')
+        this.$set(this.attr.productSelect, 'cart_num', 0)
+        this.$set(this, 'attrValue', '')
+        this.$set(this, 'attrTxt', '请选择')
+      }
+    },
+    //收藏商品
+    setCollect: function () {
+      let that = this,
+        id = that.storeInfo.id,
+        category = 'collect'
+      if (that.storeInfo.userCollect) {
+        getCollectDel(id, category).then(function () {
+          that.storeInfo.userCollect = !that.storeInfo.userCollect
+        })
+      } else {
+        getCollectAdd(id, category).then(function () {
+          that.storeInfo.userCollect = !that.storeInfo.userCollect
+        })
+      }
+    },
+    //  点击加入购物车按钮
+    joinCart: function () {
+      //0=加入购物车
+      this.goCat(0)
+    },
+    // 加入购物车；
+    goCat: function (news) {
+      let that = this,
+        productSelect = that.productValue[this.attrValue]
+      //打开属性
+      if (that.attrValue) {
+        //默认选中了属性，但是没有打开过属性弹窗还是自动打开让用户查看默认选中的属性
+        that.attr.cartAttr = !that.isOpen ? true : false
+      } else {
+        if (that.isOpen) that.attr.cartAttr = true
+        else that.attr.cartAttr = !that.attr.cartAttr
+      }
+      //只有关闭属性弹窗时进行加入购物车
+      if (that.attr.cartAttr === true && that.isOpen === false) return (that.isOpen = true)
+      //如果有属性,没有选择,提示用户选择
+      if (that.attr.productAttr.length && productSelect === undefined && that.isOpen === true) {
+        uni.showToast({
+          title: '产品库存不足，请选择其它',
+          icon: 'none',
+          duration: 2000,
+        })
+        return
+      }
+      let q = {
+        productId: that.id,
+        cartNum: that.attr.productSelect.cart_num,
+        new: news,
+        uniqueId: that.attr.productSelect !== undefined ? that.attr.productSelect.unique : '',
+      }
+      postCartAdd(q)
+        .then(function (res) {
+          console.log(res)
+          that.isOpen = false
+          that.attr.cartAttr = false
+          if (news) {
+            if (!res.data) {
               uni.showToast({
-                title: "添加购物车成功",
-                icon: "success",
+                title: res.msg || res.data.msg || res.data.message,
+                icon: 'none',
                 duration: 2000,
-                complete: () => {
-                  that.getCartCount(true);
-                },
-              });
+              })
+              return
             }
-          })
-          .catch((error) => {
-            console.log(error)
-            that.isOpen = false;
+            that.$yrouter.push({
+              path: '/pages/order/OrderSubmission/index',
+              query: {
+                id: res.data.cartId,
+                isIntegral: that.isIntegral,
+              },
+            })
+          } else {
             uni.showToast({
-              title: error.msg ||
-								error.response.data.msg ||
-								error.response.data.message,
-              icon: "none",
+              title: '添加购物车成功',
+              icon: 'success',
               duration: 2000,
-            });
-          });
-      },
-      //获取购物车数量
-      getCartCount: function (isAnima) {
-        let that = this;
-        const isLogin = that.isLogin;
-        if (isLogin) {
-          getCartCount({
-            numType: 0,
-          }).then((res) => {
-            that.CartCount = res.data.count;
-            //加入购物车后重置属性
-            if (isAnima) {
-              that.animated = true;
-              setTimeout(function () {
-                that.animated = false;
-              }, 500);
-            }
-          });
-        }
-      },
-      //立即购买；
-      tapBuy: function () {
-        //  1=直接购买
-        this.goCat(1);
-      },
-      listenerActionSheet: function () {
-        if (isWeixin() === true) {
-          this.weixinStatus = true;
-        }
-        this.posters = true;
-      },
-      listenerActionClose: function () {
-        this.posters = false;
-      },
-      setOpenShare: function () {
-        var data = this.storeInfo;
-        var href = this.location.href;
-        if (this.$deviceType == "weixin") {
-          if (this.isLogin) {
-            getUserInfo().then((res) => {
-              href =
-                href.indexOf("?") === -1 ?
-                href + "?spread=" + res.data.uid :
-                href + "&spread=" + res.data.uid;
-              var configAppMessage = {
-                desc: data.storeInfo,
-                title: data.storeName,
-                link: href,
-                imgUrl: data.image,
-              };
-              wechatEvevt(
-                  ["updateAppMessageShareData", "updateTimelineShareData"],
-                  configAppMessage
-                )
-                .then((res) => {})
-                .catch((res) => {
-                  if (res.is_ready) {
-                    res.wx.updateAppMessageShareData(configAppMessage);
-                    res.wx.updateTimelineShareData(configAppMessage);
-                  }
-                });
-            });
-          } else {
+              complete: () => {
+                that.getCartCount(true)
+              },
+            })
+          }
+        })
+        .catch(error => {
+          console.log(error)
+          that.isOpen = false
+          uni.showToast({
+            title: error.msg || error.response.data.msg || error.response.data.message,
+            icon: 'none',
+            duration: 2000,
+          })
+        })
+    },
+    //获取购物车数量
+    getCartCount: function (isAnima) {
+      let that = this
+      const isLogin = that.isLogin
+      if (isLogin) {
+        getCartCount({
+          numType: 0,
+        }).then(res => {
+          that.CartCount = res.data.count
+          //加入购物车后重置属性
+          if (isAnima) {
+            that.animated = true
+            setTimeout(function () {
+              that.animated = false
+            }, 500)
+          }
+        })
+      }
+    },
+    //立即购买；
+    tapBuy: function () {
+      //  1=直接购买
+      this.goCat(1)
+    },
+    listenerActionSheet: function () {
+      if (isWeixin() === true) {
+        this.weixinStatus = true
+      }
+      this.posters = true
+    },
+    listenerActionClose: function () {
+      this.posters = false
+    },
+    setOpenShare: function () {
+      var data = this.storeInfo
+      var href = this.location.href
+      if (this.$deviceType == 'weixin') {
+        if (this.isLogin) {
+          getUserInfo().then(res => {
+            href = href.indexOf('?') === -1 ? href + '?spread=' + res.data.uid : href + '&spread=' + res.data.uid
             var configAppMessage = {
               desc: data.storeInfo,
               title: data.storeName,
               link: href,
               imgUrl: data.image,
-            };
-            wechatEvevt(
-                ["updateAppMessageShareData", "updateTimelineShareData"],
-                configAppMessage
-              )
-              .then((res) => {})
-              .catch((res) => {
+            }
+            wechatEvevt(['updateAppMessageShareData', 'updateTimelineShareData'], configAppMessage)
+              .then(res => {})
+              .catch(res => {
                 if (res.is_ready) {
-                  res.wx.updateAppMessageShareData(configAppMessage);
-                  res.wx.updateTimelineShareData(configAppMessage);
+                  res.wx.updateAppMessageShareData(configAppMessage)
+                  res.wx.updateTimelineShareData(configAppMessage)
                 }
-              });
+              })
+          })
+        } else {
+          var configAppMessage = {
+            desc: data.storeInfo,
+            title: data.storeName,
+            link: href,
+            imgUrl: data.image,
           }
+          wechatEvevt(['updateAppMessageShareData', 'updateTimelineShareData'], configAppMessage)
+            .then(res => {})
+            .catch(res => {
+              if (res.is_ready) {
+                res.wx.updateAppMessageShareData(configAppMessage)
+                res.wx.updateTimelineShareData(configAppMessage)
+              }
+            })
         }
-      },
+      }
     },
-  };
+  },
+}
 </script>
 
-
 <style scoped lang="less">
-  .geoPage {
-    position: fixed;
-    width: 100%;
-    height: 100%;
-    top: 0;
-    z-index: 10000;
-  }
-
-  .product-con .store-info {
-    margin-top: 0.2 * 100rpx;
-    background-color: #fff;
-  }
-
-  .product-con .store-info .title {
-    padding: 0 0.3 * 100rpx;
-    font-size: 0.28 * 100rpx;
-    color: #282828;
-    height: 0.8 * 100rpx;
-    line-height: 0.8 * 100rpx;
-    border-bottom: 0.01 * 100rpx solid #f5f5f5;
-  }
-
-  .product-con .store-info .info {
-    padding: 0 0.3 * 100rpx;
-    height: 1.26 * 100rpx;
-  }
-
-  .product-con .store-info .info .picTxt {
-    width: 100%;
-    display: flex;
-    align-items: center;
-  }
-
-  .product-con .store-info .info .picTxt .pictrue {
-    width: 0.76 * 100rpx;
-    height: 0.76 * 100rpx;
-    margin-right: 0.2 * 100rpx;
-  }
-
-  .product-con .store-info .info .picTxt .pictrue image {
-    width: 100%;
-    height: 100%;
-    border-radius: 0.06 * 100rpx;
-  }
-
-  .product-con .store-info .info .picTxt .text {
-    flex: 1;
-  }
-
-  .product-con .store-info .info .picTxt .text .name {
-    font-size: 0.3 * 100rpx;
-    color: #282828;
-  }
-
-  .product-con .store-info .info .picTxt .text .address {
-    font-size: 0.24 * 100rpx;
-    color: #666;
-    margin-top: 0.03 * 100rpx;
-  }
-
-  .product-con .store-info .info .picTxt .text .address .iconfont {
-    color: #707070;
-    font-size: 0.18 * 100rpx;
-    margin-left: 0.1 * 100rpx;
-  }
-
-  .product-con .store-info .info .picTxt .addressBox {
-    display: flex;
-    flex-direction: column;
-    align-items: flex-end;
-  }
-
-  .product-con .store-info .info .picTxt .addressBox .iconfont {
-    font-size: 0.4 * 100rpx;
-  }
-
-  .product-con .store-info .info .picTxt .addressBox .addressTxt {
-    font-size: 0.24 * 100rpx;
-    color: #eb3729;
-  }
-
-  .product-con .store-info .praise {
-    font-size: 0.28 * 100rpx;
-    color: #808080;
-  }
-
-  .product-con .store-info .praise .iconfont {
-    font-size: 0.28 * 100rpx;
-  }
-
-  .product-con .superior {
-    background-color: #fff;
-    margin-top: 0.2 * 100rpx;
-  }
-
-  .product-con .superior .title {
-    height: 0.98 * 100rpx;
-  }
-
-  .product-con .superior .title image {
-    width: 0.3 * 100rpx;
-    height: 0.3 * 100rpx;
-  }
-
-  .product-con .superior .title .titleTxt {
-    margin: 0 0.2 * 100rpx;
-    font-size: 0.3 * 100rpx;
-    background-image: linear-gradient(to right, #f57a37 0%, #f21b07 100%);
-    background-image: -webkit-linear-gradient(to right, #f57a37 0%, #f21b07 100%);
-    background-image: -moz-linear-gradient(to right, #f57a37 0%, #f21b07 100%);
-    -webkit-background-clip: text;
-    -webkit-text-fill-color: transparent;
-  }
-
-  .product-con .superior .slider-banner {
-    width: 6.9 * 100rpx;
-    margin: 0 auto;
-    padding-bottom: 0.2 * 100rpx;
-  }
-
-  .product-con .superior .slider-banner .list {
-    width: 100%;
-    padding-bottom: 0.2 * 100rpx;
-  }
-
-  .product-con .superior .slider-banner .list .item {
-    width: 2.15 * 100rpx;
-    margin: 0 0.22 * 100rpx 0.3 * 100rpx 0;
-    font-size: 0.26 * 100rpx;
-  }
-
-  .product-con .superior .slider-banner .list .item:nth-of-type(3n) {
-    margin-right: 0;
-  }
-
-  .product-con .superior .slider-banner .list .item .pictrue {
-    width: 100%;
-    height: 2.15 * 100rpx;
-  }
-
-  .product-con .superior .slider-banner .list .item .pictrue image {
-    width: 100%;
-    height: 100%;
-    border-radius: 0.06 * 100rpx;
-  }
-
-  .product-con .superior .slider-banner .list .item .name {
-    color: #282828;
-    margin-top: 0.12 * 100rpx;
-  }
-
-  .product-con .superior .slider-banner .swiper-pagination-bullet {
-    background-color: #999;
-  }
-
-  .product-con .superior .slider-banner .swiper-pagination-bullet-active {
-    background-color: #e93323;
-  }
-
-  .mask {
-    -webkit-filter: blur(2px);
-    -moz-filter: blur(2px);
-    -ms-filter: blur(2px);
-    filter: blur(2px);
-  }
-
-  .product-con .product-intro .conter view {
-    width: 100% !important;
-  }
-
-  .generate-posters {
-    width: 100%;
-    height: 1.7 * 100rpx;
-    background-color: #fff;
-    position: fixed;
-    left: 0;
-    bottom: 0;
-    z-index: 99;
-    transform: translate3d(0, 100%, 0);
-    -webkit-transform: translate3d(0, 100%, 0);
-    -ms-transform: translate3d(0, 100%, 0);
-    -moz-transform: translate3d(0, 100%, 0);
-    -o-transform: translate3d(0, 100%, 0);
-    transition: all 0.3s cubic-bezier(0.25, 0.5, 0.5, 0.9);
-    -webkit-transition: all 0.3s cubic-bezier(0.25, 0.5, 0.5, 0.9);
-    -moz-transition: all 0.3s cubic-bezier(0.25, 0.5, 0.5, 0.9);
-    -o-transition: all 0.3s cubic-bezier(0.25, 0.5, 0.5, 0.9);
-  }
-
-  .generate-posters.on {
-    transform: translate3d(0, 0, 0);
-    -webkit-transform: translate3d(0, 0, 0);
-    -ms-transform: translate3d(0, 0, 0);
-    -moz-transform: translate3d(0, 0, 0);
-    -o-transform: translate3d(0, 0, 0);
-  }
-
-  .generate-posters .item {
-    flex: 50%;
-    -webkit-flex: 50%;
-    -ms-flex: 50%;
-    text-align: center;
-  }
-
-  .generate-posters .item .iconfont {
-    font-size: 0.8 * 100rpx;
-    color: #5eae72;
-  }
-
-  .generate-posters .item .iconfont.icon-haibao {
-    color: #5391f1;
-  }
-
-  .noscroll {
-    height: 100%;
-    overflow: hidden;
-  }
+.geoPage {
+  position: fixed;
+  width: 100%;
+  height: 100%;
+  top: 0;
+  z-index: 10000;
+}
+
+.product-con .store-info {
+  margin-top: 0.2 * 100rpx;
+  background-color: #fff;
+}
+
+.product-con .store-info .title {
+  padding: 0 0.3 * 100rpx;
+  font-size: 0.28 * 100rpx;
+  color: #282828;
+  height: 0.8 * 100rpx;
+  line-height: 0.8 * 100rpx;
+  border-bottom: 0.01 * 100rpx solid #f5f5f5;
+}
+
+.product-con .store-info .info {
+  padding: 0 0.3 * 100rpx;
+  height: 1.26 * 100rpx;
+}
+
+.product-con .store-info .info .picTxt {
+  width: 100%;
+  display: flex;
+  align-items: center;
+}
+
+.product-con .store-info .info .picTxt .pictrue {
+  width: 0.76 * 100rpx;
+  height: 0.76 * 100rpx;
+  margin-right: 0.2 * 100rpx;
+}
+
+.product-con .store-info .info .picTxt .pictrue image {
+  width: 100%;
+  height: 100%;
+  border-radius: 0.06 * 100rpx;
+}
+
+.product-con .store-info .info .picTxt .text {
+  flex: 1;
+}
+
+.product-con .store-info .info .picTxt .text .name {
+  font-size: 0.3 * 100rpx;
+  color: #282828;
+}
+
+.product-con .store-info .info .picTxt .text .address {
+  font-size: 0.24 * 100rpx;
+  color: #666;
+  margin-top: 0.03 * 100rpx;
+}
+
+.product-con .store-info .info .picTxt .text .address .iconfont {
+  color: #707070;
+  font-size: 0.18 * 100rpx;
+  margin-left: 0.1 * 100rpx;
+}
+
+.product-con .store-info .info .picTxt .addressBox {
+  display: flex;
+  flex-direction: column;
+  align-items: flex-end;
+}
+
+.product-con .store-info .info .picTxt .addressBox .iconfont {
+  font-size: 0.4 * 100rpx;
+}
+
+.product-con .store-info .info .picTxt .addressBox .addressTxt {
+  font-size: 0.24 * 100rpx;
+  color: #eb3729;
+}
+
+.product-con .store-info .praise {
+  font-size: 0.28 * 100rpx;
+  color: #808080;
+}
+
+.product-con .store-info .praise .iconfont {
+  font-size: 0.28 * 100rpx;
+}
+
+.product-con .superior {
+  background-color: #fff;
+  margin-top: 0.2 * 100rpx;
+}
+
+.product-con .superior .title {
+  height: 0.98 * 100rpx;
+}
+
+.product-con .superior .title image {
+  width: 0.3 * 100rpx;
+  height: 0.3 * 100rpx;
+}
+
+.product-con .superior .title .titleTxt {
+  margin: 0 0.2 * 100rpx;
+  font-size: 0.3 * 100rpx;
+  background-image: linear-gradient(to right, #f57a37 0%, #f21b07 100%);
+  background-image: -webkit-linear-gradient(to right, #f57a37 0%, #f21b07 100%);
+  background-image: -moz-linear-gradient(to right, #f57a37 0%, #f21b07 100%);
+  -webkit-background-clip: text;
+  -webkit-text-fill-color: transparent;
+}
+
+.product-con .superior .slider-banner {
+  width: 6.9 * 100rpx;
+  margin: 0 auto;
+  padding-bottom: 0.2 * 100rpx;
+}
+
+.product-con .superior .slider-banner .list {
+  width: 100%;
+  padding-bottom: 0.2 * 100rpx;
+}
+
+.product-con .superior .slider-banner .list .item {
+  width: 2.15 * 100rpx;
+  margin: 0 0.22 * 100rpx 0.3 * 100rpx 0;
+  font-size: 0.26 * 100rpx;
+}
+
+.product-con .superior .slider-banner .list .item:nth-of-type(3n) {
+  margin-right: 0;
+}
+
+.product-con .superior .slider-banner .list .item .pictrue {
+  width: 100%;
+  height: 2.15 * 100rpx;
+}
+
+.product-con .superior .slider-banner .list .item .pictrue image {
+  width: 100%;
+  height: 100%;
+  border-radius: 0.06 * 100rpx;
+}
+
+.product-con .superior .slider-banner .list .item .name {
+  color: #282828;
+  margin-top: 0.12 * 100rpx;
+}
+
+.product-con .superior .slider-banner .swiper-pagination-bullet {
+  background-color: #999;
+}
+
+.product-con .superior .slider-banner .swiper-pagination-bullet-active {
+  background-color: #e93323;
+}
+
+.mask {
+  -webkit-filter: blur(2px);
+  -moz-filter: blur(2px);
+  -ms-filter: blur(2px);
+  filter: blur(2px);
+}
+
+.product-con .product-intro .conter view {
+  width: 100% !important;
+}
+
+.generate-posters {
+  width: 100%;
+  height: 1.7 * 100rpx;
+  background-color: #fff;
+  position: fixed;
+  left: 0;
+  bottom: 0;
+  z-index: 99;
+  transform: translate3d(0, 100%, 0);
+  -webkit-transform: translate3d(0, 100%, 0);
+  -ms-transform: translate3d(0, 100%, 0);
+  -moz-transform: translate3d(0, 100%, 0);
+  -o-transform: translate3d(0, 100%, 0);
+  transition: all 0.3s cubic-bezier(0.25, 0.5, 0.5, 0.9);
+  -webkit-transition: all 0.3s cubic-bezier(0.25, 0.5, 0.5, 0.9);
+  -moz-transition: all 0.3s cubic-bezier(0.25, 0.5, 0.5, 0.9);
+  -o-transition: all 0.3s cubic-bezier(0.25, 0.5, 0.5, 0.9);
+}
+
+.generate-posters.on {
+  transform: translate3d(0, 0, 0);
+  -webkit-transform: translate3d(0, 0, 0);
+  -ms-transform: translate3d(0, 0, 0);
+  -moz-transform: translate3d(0, 0, 0);
+  -o-transform: translate3d(0, 0, 0);
+}
+
+.generate-posters .item {
+  flex: 50%;
+  -webkit-flex: 50%;
+  -ms-flex: 50%;
+  text-align: center;
+}
+
+.generate-posters .item .iconfont {
+  font-size: 0.8 * 100rpx;
+  color: #5eae72;
+}
+
+.generate-posters .item .iconfont.icon-haibao {
+  color: #5391f1;
+}
+
+.noscroll {
+  height: 100%;
+  overflow: hidden;
+}
 </style>
-
diff --git a/pages/shop/GoodsList/index.vue b/pages/shop/GoodsList/index.vue
index a833bfe..d8cda9f 100644
--- a/pages/shop/GoodsList/index.vue
+++ b/pages/shop/GoodsList/index.vue
@@ -10,7 +10,7 @@
       </view>
     </form>
     <view class="nav acea-row row-middle">
-      <view class="item" :class="title ? 'font-color-red' : ''" @click="set_where(0)">{{ title ? title : "默认" }}</view>
+      <view class="item" :class="title ? 'font-color-red' : ''" @click="set_where(0)">{{ title ? title : '默认' }}</view>
       <view class="item" @click="set_where(1)">
         价格
         <image src="@/static/images/horn.png" v-if="price === 0" />
@@ -26,10 +26,8 @@
       <!-- down -->
       <view class="item" :class="nows ? 'font-color-red' : ''" @click="set_where(3)">新品</view>
     </view>
-    <view class="list acea-row row-between-wrapper" :class="Switch === true ? '' : 'on'" ref="container"
-      v-if="isIntegral=='false'">
-      <view @click="goGoodsCon(item)" class="item" :class="Switch === true ? '' : 'on'"
-        v-for="(item, productListIndex) in productList" :key="productListIndex" :title="item.storeName">
+    <view class="list acea-row row-between-wrapper" :class="Switch === true ? '' : 'on'" ref="container" v-if="isIntegral == 'false'">
+      <view @click="goGoodsCon(item)" class="item" :class="Switch === true ? '' : 'on'" v-for="(item, productListIndex) in productList" :key="productListIndex" :title="item.storeName">
         <view class="pictrue" :class="Switch === true ? '' : 'on'">
           <image :src="item.image" :class="Switch === true ? '' : 'on'" />
         </view>
@@ -46,10 +44,8 @@
         </view>
       </view>
     </view>
-    <view class="list acea-row row-between-wrapper" :class="Switch === true ? '' : 'on'" ref="container"
-      v-if="isIntegral=='true'">
-      <view @click="goGoodsCon(item)" class="item" :class="Switch === true ? '' : 'on'"
-        v-for="(item, productListIndex) in productList" :key="productListIndex" :title="item.storeName">
+    <view class="list acea-row row-between-wrapper" :class="Switch === true ? '' : 'on'" ref="container" v-if="isIntegral == 'true'">
+      <view @click="goGoodsCon(item)" class="item" :class="Switch === true ? '' : 'on'" v-for="(item, productListIndex) in productList" :key="productListIndex" :title="item.storeName">
         <view class="pictrue" :class="Switch === true ? '' : 'on'">
           <image :src="item.image" :class="Switch === true ? '' : 'on'" />
         </view>
@@ -71,229 +67,222 @@
         <image src="@/static/images/noGood.png" class="image" />
       </view>
     </view>
-    <Recommend v-if="productList.length === 0 && where.page > 1" :recommendLoading="recommendLoading"
-      @changeRecommendLoading="changeRecommendLoading"></Recommend>
+    <Recommend v-if="productList.length === 0 && where.page > 1" :recommendLoading="recommendLoading" @changeRecommendLoading="changeRecommendLoading"></Recommend>
   </view>
 </template>
 <script>
-  import Recommend from "@/components/Recommend";
-  import {
-    getProducts,getProductsIntegral
-  } from "@/api/store";
-  import Loading from "@/components/Loading";
+import Recommend from '@/components/Recommend'
+import { getProducts, getProductsIntegral } from '@/api/store'
+import Loading from '@/components/Loading'
 
-  export default {
-    name: "GoodsList",
-    components: {
-      Recommend,
-      Loading,
-    },
-    props: {},
-    data: function () {
-      // const { s = "", id = 0, title = "" } = this.$yroute.query;
-      const s = "",
-        id = 0,
-        title = "";
+export default {
+  name: 'GoodsList',
+  components: {
+    Recommend,
+    Loading,
+  },
+  props: {},
+  data: function () {
+    // const { s = "", id = 0, title = "" } = this.$yroute.query;
+    const s = '',
+      id = 0,
+      title = ''
 
-      return {
-        hostProduct: [],
-        productList: [],
-        Switch: true,
-        where: {
-          page: 1,
-          limit: 8,
-          keyword: s,
-          sid: id, //二级分类id
-          news: 0,
-          priceOrder: "",
-          salesOrder: "",
-        },
-        title: title && id ? title : "",
-        loadTitle: "",
-        loading: false,
-        loadend: false,
-        price: 0,
-        stock: 0,
-        nows: false,
-        recommendLoading: false,
-        target: false,
-        isIntegral: false
-      };
-    },
-    watch: {
-      title() {
-        this.updateTitle();
-      },
-      $yroute(to) {
-        // if (to.name !== "GoodsList") return;
-        // const { s = "", id = 0, title = "" } = to.query;
-        // if (s !== this.where.keyword || id !== this.where.sid) {
-        //   this.where.keyword = s;
-        //   this.loadend = false;
-        //   this.loading = false;
-        //   this.where.page = 1;
-        //   this.where.sid = id;
-        //   this.title = title && id ? title : "";
-        //   this.nows = false;
-        //   this.$set(this, "productList", []);
-        //   this.price = 0;
-        //   this.stock = 0;
-        //   this.getProductList();
-        // }
+    return {
+      hostProduct: [],
+      productList: [],
+      Switch: true,
+      where: {
+        page: 1,
+        limit: 8,
+        keyword: s,
+        sid: id, //二级分类id
+        news: 0,
+        priceOrder: '',
+        salesOrder: '',
       },
+      title: title && id ? title : '',
+      loadTitle: '',
+      loading: false,
+      loadend: false,
+      price: 0,
+      stock: 0,
+      nows: false,
+      recommendLoading: false,
+      target: false,
+      isIntegral: false,
+    }
+  },
+  watch: {
+    title() {
+      this.updateTitle()
     },
-    mounted: function () {
-      const {
-        s = "", id = 0, title = "", isIntegral = false
-      } = this.$yroute.query;
-      this.where.keyword = s;
-      this.where.isIntegral = isIntegral == 'true' ? 1 : 0;
-      this.isIntegral = isIntegral
-      this.updateTitle();
-      this.getProductList();
+    $yroute(to) {
+      // if (to.name !== "GoodsList") return;
+      // const { s = "", id = 0, title = "" } = to.query;
+      // if (s !== this.where.keyword || id !== this.where.sid) {
+      //   this.where.keyword = s;
+      //   this.loadend = false;
+      //   this.loading = false;
+      //   this.where.page = 1;
+      //   this.where.sid = id;
+      //   this.title = title && id ? title : "";
+      //   this.nows = false;
+      //   this.$set(this, "productList", []);
+      //   this.price = 0;
+      //   this.stock = 0;
+      //   this.getProductList();
+      // }
     },
-    onReachBottom() {
-      this.recommendLoading = true;
-      !this.loading && this.getProductList();
+  },
+  mounted: function () {
+    const { s = '', id = 0, title = '', isIntegral = false } = this.$yroute.query
+    this.where.keyword = s
+    this.where.isIntegral = isIntegral == 'true' ? 1 : 0
+    this.isIntegral = isIntegral
+    this.updateTitle()
+    this.getProductList()
+  },
+  onReachBottom() {
+    this.recommendLoading = true
+    !this.loading && this.getProductList()
+  },
+  onHide() {
+    // this.hostProduct = [];
+    // this.productList = [];
+    // this.Switch = true;
+    // this.where = {
+    //   page: 1,
+    //   limit: 8,
+    //   keyword: s,
+    //   sid: id, //二级分类id
+    //   news: 0,
+    //   priceOrder: "",
+    //   salesOrder: ""
+    // };
+    // this.loadTitle = "";
+    // this.loading = false;
+    // this.loadend = false;
+    // this.price = 0;
+    // this.stock = 0;
+    // this.nows = fals;
+  },
+  methods: {
+    changeRecommendLoading(recommendLoading) {
+      this.recommendLoading = recommendLoading
     },
-    onHide() {
-      // this.hostProduct = [];
-      // this.productList = [];
-      // this.Switch = true;
-      // this.where = {
-      //   page: 1,
-      //   limit: 8,
-      //   keyword: s,
-      //   sid: id, //二级分类id
-      //   news: 0,
-      //   priceOrder: "",
-      //   salesOrder: ""
-      // };
-      // this.loadTitle = "";
-      // this.loading = false;
-      // this.loadend = false;
-      // this.price = 0;
-      // this.stock = 0;
-      // this.nows = fals;
+    goGoodsCon(item) {
+      this.$yrouter.push({
+        path: '/pages/shop/IntegralGoodsCon/index',
+        query: {
+          id: item.id,
+          isIntegral: this.isIntegral,
+        },
+      })
     },
-    methods: {
-      changeRecommendLoading(recommendLoading) {
-        this.recommendLoading = recommendLoading;
-      },
-      goGoodsCon(item) {
-        this.$yrouter.push({
-          path: "/pages/shop/GoodsCon/index",
-          query: {
-            id: item.id,
-            isIntegral:this.isIntegral
-          },
-        });
-      },
-      updateTitle() {
-        // document.title = this.title || this.$yroute.meta.title;
-      },
-      getProductList() {
-        var that = this;
-        this.setWhere();
-        // if (to.name !== "GoodsList") return;
-        const {
-          s = "", id = 0, title = ""
-        } = this.$yroute.query;
-        if (s !== this.where.keyword || id !== this.where.sid) {
-          this.loadend = false;
-          this.loading = false;
-          this.where.page = 1;
-          this.where.sid = id;
-          this.title = title && id ? title : "";
-          this.nows = false;
-          this.$set(this, "productList", []);
-          this.price = 0;
-          this.stock = 0;
-          // this.getProductList();
-        }
-        let q = that.where;
-        let getData = this.isIntegral !== 'true' ? getProducts : getProductsIntegral
-        getData(q).then((res) => {
-          that.loading = false;
-          if (that.target) {
-            that.productList = res.data;
-          } else {
-            that.productList.push.apply(that.productList, res.data);
-          }
-          that.target = false
-          that.loadend = res.data.length < that.where.limit; //判断所有数据是否加载完成；
-          that.where.page = that.where.page + 1;
-        });
-      },
-      submitForm: function () {
-        this.$set(this, "productList", []);
-        this.where.page = 1;
-        this.loadend = false;
-        this.loading = false;
-        this.getProductList();
-      },
-      //点击事件处理
-      set_where: function (index) {
-        let that = this;
-        switch (index) {
-          case 0:
-            return that.$yrouter.push({
-              path: "/pages/shop/GoodsClass/index",
-            });
-          case 1:
-            if (that.price === 0) that.price = 1;
-            else if (that.price === 1) that.price = 2;
-            else if (that.price === 2) that.price = 0;
-            that.stock = 0;
-            break;
-          case 2:
-            if (that.stock === 0) that.stock = 1;
-            else if (that.stock === 1) that.stock = 2;
-            else if (that.stock === 2) that.stock = 0;
-            that.price = 0;
-            break;
-          case 3:
-            that.nows = !that.nows;
-            break;
-          default:
-            break;
-        }
-        this.productList = [];
-        that.$set(that, "productList", []);
-        that.where.page = 1;
-        that.target = true;
-        that.loadend = false;
-        that.getProductList();
-      },
-      //设置where条件
-      setWhere: function () {
-        let that = this;
-        if (that.price === 0) {
-          that.where.priceOrder = "";
-        } else if (that.price === 1) {
-          that.where.priceOrder = "asc";
-        } else if (that.price === 2) {
-          that.where.priceOrder = "desc";
-        }
-        if (that.stock === 0) {
-          that.where.salesOrder = "";
-        } else if (that.stock === 1) {
-          that.where.salesOrder = "asc";
-        } else if (that.stock === 2) {
-          that.where.salesOrder = "desc";
+    updateTitle() {
+      // document.title = this.title || this.$yroute.meta.title;
+    },
+    getProductList() {
+      var that = this
+      this.setWhere()
+      // if (to.name !== "GoodsList") return;
+      const { s = '', id = 0, title = '' } = this.$yroute.query
+      if (s !== this.where.keyword || id !== this.where.sid) {
+        this.loadend = false
+        this.loading = false
+        this.where.page = 1
+        this.where.sid = id
+        this.title = title && id ? title : ''
+        this.nows = false
+        this.$set(this, 'productList', [])
+        this.price = 0
+        this.stock = 0
+        // this.getProductList();
+      }
+      let q = that.where
+      let getData = this.isIntegral !== 'true' ? getProducts : getProductsIntegral
+      getData(q).then(res => {
+        that.loading = false
+        if (that.target) {
+          that.productList = res.data
+        } else {
+          that.productList.push.apply(that.productList, res.data)
         }
-        that.where.news = that.nows ? "1" : "0";
-      },
-      switchTap: function () {
-        let that = this;
-        that.Switch = !that.Switch;
-      },
+        that.target = false
+        that.loadend = res.data.length < that.where.limit //判断所有数据是否加载完成；
+        that.where.page = that.where.page + 1
+      })
+    },
+    submitForm: function () {
+      this.$set(this, 'productList', [])
+      this.where.page = 1
+      this.loadend = false
+      this.loading = false
+      this.getProductList()
+    },
+    //点击事件处理
+    set_where: function (index) {
+      let that = this
+      switch (index) {
+        case 0:
+          return that.$yrouter.push({
+            path: '/pages/shop/GoodsClass/index',
+          })
+        case 1:
+          if (that.price === 0) that.price = 1
+          else if (that.price === 1) that.price = 2
+          else if (that.price === 2) that.price = 0
+          that.stock = 0
+          break
+        case 2:
+          if (that.stock === 0) that.stock = 1
+          else if (that.stock === 1) that.stock = 2
+          else if (that.stock === 2) that.stock = 0
+          that.price = 0
+          break
+        case 3:
+          that.nows = !that.nows
+          break
+        default:
+          break
+      }
+      this.productList = []
+      that.$set(that, 'productList', [])
+      that.where.page = 1
+      that.target = true
+      that.loadend = false
+      that.getProductList()
+    },
+    //设置where条件
+    setWhere: function () {
+      let that = this
+      if (that.price === 0) {
+        that.where.priceOrder = ''
+      } else if (that.price === 1) {
+        that.where.priceOrder = 'asc'
+      } else if (that.price === 2) {
+        that.where.priceOrder = 'desc'
+      }
+      if (that.stock === 0) {
+        that.where.salesOrder = ''
+      } else if (that.stock === 1) {
+        that.where.salesOrder = 'asc'
+      } else if (that.stock === 2) {
+        that.where.salesOrder = 'desc'
+      }
+      that.where.news = that.nows ? '1' : '0'
+    },
+    switchTap: function () {
+      let that = this
+      that.Switch = !that.Switch
     },
-  };
+  },
+}
 </script>
 <style scoped lang="less">
-  .noCommodity {
-    border-top: 3px solid #f5f5f5;
-    padding-bottom: 1px;
-  }
+.noCommodity {
+  border-top: 3px solid #f5f5f5;
+  padding-bottom: 1px;
+}
 </style>
diff --git a/pages/shop/IntegralGoodsCon/index.vue b/pages/shop/IntegralGoodsCon/index.vue
new file mode 100644
index 0000000..ed13062
--- /dev/null
+++ b/pages/shop/IntegralGoodsCon/index.vue
@@ -0,0 +1,867 @@
+<template>
+  <view :class="productConClass">
+    <view v-if="storeInfo.id">
+      <!-- 轮播图 -->
+      <product-con-swiper :img-urls="storeInfo.sliderImageArr"></product-con-swiper>
+
+      <!-- 商品信息描述 -->
+      <view class="wrapper">
+        <view class="share acea-row row-between row-bottom">
+          <view class="money font-color-red">
+            <text class="num">{{ attr.productSelect.integral || storeInfo.integral }}积分</text>
+          </view>
+          <view class="iconfont icon-fenxiang" @click="listenerActionSheet"></view>
+        </view>
+        <view class="introduce">{{ storeInfo.storeName }}</view>
+        <view class="label acea-row row-between-wrapper">
+          <text>库存:{{ storeInfo.stock }}{{ storeInfo.unitName }}</text>
+          <text>销量:{{ storeInfo.sales }}{{ storeInfo.unitName }}</text>
+        </view>
+      </view>
+
+      <!-- 规格 -->
+      <view class="attribute acea-row row-between-wrapper" @click="selecAttrTap">
+        <view>
+          <text>{{ attrTxt }}：</text>
+          <text class="atterTxt">{{ attrValue }}</text>
+        </view>
+        <view class="iconfont icon-jiantou"></view>
+      </view>
+
+      <!-- 用户评价 -->
+      <view class="userEvaluation" v-if="replyCount">
+        <view class="title acea-row row-between-wrapper">
+          <view>用户评价({{ replyCount }})</view>
+          <text @click="goEvaluateList(id)" class="praise">
+            <text class="font-color-red">{{ replyChance }}%</text>好评率
+            <text class="iconfont icon-jiantou"></text>
+          </text>
+        </view>
+        <user-evaluation :reply="reply"></user-evaluation>
+      </view>
+
+      <!-- 商品详情 -->
+      <view class="product-intro">
+        <text class="title">产品介绍</text>
+        <view class="conter" v-html="storeInfo.description"></view>
+      </view>
+
+      <view style="height: 100rpx"></view>
+      <!-- 操作栏 -->
+      <view class="footer acea-row row-between-wrapper">
+        <view class="item" @click="goHome">
+          <view class="iconfont icon-shouye-xianxing"></view>
+          <text>首页</text>
+        </view>
+        <view class="bnt in-bnt acea-row">
+          <view class="buy" @click="tapBuy">
+            <text>立即购买</text>
+          </view>
+        </view>
+      </view>
+
+      <!-- 商品规格弹窗 -->
+      <ProductWindow :isIntegral="isIntegral" v-on:changeFun="changeFun" :attr="attr" :cartNum="cart_num"></ProductWindow>
+      <!-- 分享海报 -->
+      <StorePoster v-on:setPosterImageStatus="setPosterImageStatus" :posterImageStatus="posterImageStatus" :posterData="posterData" :goodId="id"></StorePoster>
+    </view>
+  </view>
+</template>
+
+<script>
+// import { swiper, swiperSlide } from "vue-awesome-swiper";
+
+import ProductConSwiper from '@/components/ProductConSwiper'
+import UserEvaluation from '@/components/UserEvaluation'
+import CouponPop from '@/components/CouponPop'
+import ProductWindow from '@/components/ProductWindow'
+import StorePoster from '@/components/StorePoster'
+import ShareInfo from '@/components/ShareInfo'
+import { getProductDetail, postCartAdd, getCartCount, getProductCode } from '@/api/store'
+import { getCoupon, getCollectAdd, getCollectDel, getUserInfo } from '@/api/user'
+import cookie from '@/utils/store/cookie'
+import { isWeixin, PosterCanvas, handleQrCode, handleUrlParam, getCurrentPageUrlWithArgs } from '@/utils'
+import { wechatEvevt } from '@/libs/wechat'
+import { imageBase64 } from '@/api/public'
+import { mapGetters } from 'vuex'
+
+export default {
+  name: 'GoodsCon',
+  components: {
+    // swiper,
+    // swiperSlide,
+    ProductConSwiper,
+    UserEvaluation,
+    CouponPop,
+    ProductWindow,
+    StorePoster,
+    ShareInfo,
+  },
+  data: function () {
+    return {
+      shareInfoStatus: false,
+      weixinStatus: false,
+      mapShow: false,
+      mapKey: '',
+      posterData: {
+        image: '',
+        title: '',
+        price: '',
+        code: '',
+      },
+      posterImageStatus: false,
+      animated: false,
+      coupon: {
+        coupon: false,
+        list: [],
+      },
+      attr: {
+        cartAttr: false,
+        productAttr: [],
+        productSelect: {},
+      },
+      isOpen: false, //是否打开属性组件
+      productValue: [],
+      id: 0,
+      storeInfo: {},
+      couponList: [],
+      attrTxt: '请选择',
+      attrValue: '',
+      cart_num: 1, //购买数量
+      replyCount: '',
+      replyChance: '',
+      reply: [],
+      priceName: 0,
+      CartCount: 0,
+      posters: false,
+      banner: [{}, {}],
+      swiperRecommend: {
+        pagination: {
+          el: '.swiper-pagination',
+          clickable: true,
+        },
+        autoplay: false,
+        loop: false,
+        speed: 1000,
+        observer: true,
+        observeParents: true,
+      },
+      goodList: [],
+      systemStore: {},
+      qqmapsdk: null,
+      productConClass: 'product-con',
+      tempName: '全国包邮',
+      isIntegral: false,
+    }
+  },
+  computed: mapGetters(['isLogin', 'location']),
+  mounted: function () {
+    this.$store.commit('get_to', 'goodcon')
+    let url = handleQrCode()
+    if (!url) {
+      url = handleUrlParam(getCurrentPageUrlWithArgs())
+    }
+    this.coupons()
+    if (url && url.id) {
+      this.id = url.id
+      let urlSpread = parseInt(url.spread)
+      if (urlSpread) {
+        cookie.set('spread', urlSpread)
+      }
+    } else {
+      this.id = this._route.query.id
+    }
+    this.isIntegral = url.isIntegral == 'true'
+    this.productCon()
+    this.setOpenShare()
+  },
+  watch: {
+    posterImageStatus(status) {
+      console.log(status)
+      if (status) {
+        this.productConClass = 'noscroll product-con'
+      } else {
+        this.productConClass = 'product-con'
+      }
+    },
+  },
+  methods: {
+    onShareAppMessage: function () {
+      return {
+        title: this.storeInfo.storeName,
+        imageUrl: this.storeInfo.image,
+        path: 'pages/shop/GoodsCon/index?id=' + this.storeInfo.id + '&spread=' + uni.getStorageSync('uid') + '&pageType=good&codeType=routine',
+        success(res) {
+          uni.showToast({
+            title: '分享成功',
+          })
+        },
+        fail(res) {
+          uni.showToast({
+            title: '分享失败',
+            icon: 'none',
+          })
+        },
+      }
+    },
+    goHome() {
+      this.$yrouter.switchTab('/pages/home/index')
+    },
+    goShoppingCart() {
+      this.$yrouter.switchTab('/pages/shop/ShoppingCart/index')
+    },
+    goCustomerList() {
+      this.$yrouter.push({
+        path: '/pages/user/CustomerList/index',
+      })
+    },
+    goStoreList() {
+      this.$yrouter.push({
+        path: '/pages/shop/StoreList/index',
+      })
+    },
+    goEvaluateList(id) {
+      this.$yrouter.push({
+        path: '/pages/shop/EvaluateList/index',
+        query: {
+          id,
+        },
+      })
+    },
+    telPhone(phoneNumber) {
+      uni.makePhoneCall({
+        phoneNumber: phoneNumber,
+        fail() {
+          console.log('取消拨打')
+        },
+      })
+    },
+    showChang: function (data) {
+      this.$yrouter.push({
+        path: '/pages/map/index',
+        query: data,
+      })
+    },
+    updateTitle() {
+      // document.title = this.storeInfo.storeName || this.$yroute.meta.title;
+    },
+    setShareInfoStatus: function () {
+      this.shareInfoStatus = !this.shareInfoStatus
+      this.posters = false
+    },
+    shareCode: function () {
+      var that = this
+      getProductCode(that.id).then(res => {
+        that.posterData.code = res.data.code
+        that.listenerActionSheet()
+      })
+    },
+    setPosterImageStatus: function () {
+      this.posterImageStatus = !this.posterImageStatus
+      this.posters = false
+    },
+    //产品详情接口；
+    productCon: function () {
+      let that = this
+      let from = this.location
+      if (this.$deviceType == 'app') {
+        from.from = 'app'
+      }
+      uni.showLoading({
+        title: '加载中',
+        mask: true,
+      })
+      getProductDetail(that.id, from)
+        .then(res => {
+          res.data.storeInfo.description = res.data.storeInfo.description.replace(/\<img/gi, '<img style="max-width:100%;height:auto;"')
+          that.$set(that, 'storeInfo', res.data.storeInfo)
+          // 给 attr 赋值，将请求回来的规格赋值给 attr
+          that.$set(that.attr, 'productAttr', res.data.productAttr)
+          that.$set(that, 'productValue', res.data.productValue)
+          that.$set(that, 'replyCount', res.data.replyCount)
+          that.$set(that, 'replyChance', res.data.replyChance)
+          that.reply = res.data.reply ? [res.data.reply] : []
+          that.$set(that, 'reply', that.reply)
+          that.$set(that, 'priceName', res.data.priceName)
+          that.$set(that, 'tempName', res.data.tempName)
+          that.posterData.image = that.storeInfo.image
+          if (that.storeInfo.storeName.length > 30) {
+            that.posterData.title = that.storeInfo.storeName.substring(0, 30) + '...'
+          } else {
+            that.posterData.title = that.storeInfo.storeName
+          }
+          that.posterData.price = that.storeInfo.price
+          that.posterData.code = that.storeInfo.codeBase
+          that.systemStore = res.data.systemStore
+          let good_list = res.data.goodList || []
+          let goodArray = []
+          let count = Math.ceil(good_list.length / 6)
+          for (let i = 0; i < count; i++) {
+            var list = good_list.slice(i * 6, 6)
+            if (list.length)
+              goodArray.push({
+                list: list,
+              })
+          }
+          that.mapKay = res.data.mapKay
+          that.$set(that, 'goodList', goodArray)
+          that.updateTitle()
+          that.DefaultSelect()
+          that.getCartCount()
+        })
+        .catch(err => {
+          uni.showToast({
+            title: err.msg || err.response.data.msg || err.response.data.message,
+            icon: 'none',
+            duration: 2000,
+          })
+        })
+        .finally(() => {
+          uni.hideLoading()
+        })
+    },
+    //默认选中属性；
+    DefaultSelect: function () {
+      let productAttr = this.attr.productAttr
+      let value = []
+      for (let i = 0; i < productAttr.length; i++) {
+        this.$set(productAttr[i], 'index', 0)
+        value.push(productAttr[i].attrValueArr[0])
+      }
+      //sort();排序函数:数字-英文-汉字；
+      let productSelect = this.productValue[value.sort().join(',')]
+      if (productSelect && productAttr.length) {
+        this.$set(this.attr.productSelect, 'store_name', this.storeInfo.storeName)
+        this.$set(this.attr.productSelect, 'image', productSelect.image)
+        this.$set(this.attr.productSelect, 'price', productSelect.price)
+        this.$set(this.attr.productSelect, 'stock', productSelect.stock)
+        this.$set(this.attr.productSelect, 'unique', productSelect.unique)
+        this.$set(this.attr.productSelect, 'integral', productSelect.integral)
+        this.$set(this.attr.productSelect, 'cart_num', 1)
+        this.$set(this, 'attrValue', value.sort().join(','))
+        this.$set(this, 'attrTxt', '已选择')
+      } else if (!productSelect && productAttr.length) {
+        this.$set(this.attr.productSelect, 'store_name', this.storeInfo.storeName)
+        this.$set(this.attr.productSelect, 'image', this.storeInfo.image)
+        this.$set(this.attr.productSelect, 'price', this.storeInfo.price)
+        this.$set(this.attr.productSelect, 'integral', this.storeInfo.integral)
+        this.$set(this.attr.productSelect, 'stock', 0)
+        this.$set(this.attr.productSelect, 'unique', '')
+        this.$set(this.attr.productSelect, 'cart_num', 0)
+        this.$set(this, 'attrValue', '')
+        this.$set(this, 'attrTxt', '请选择')
+      } else if (!productSelect && !productAttr.length) {
+        this.$set(this.attr.productSelect, 'store_name', this.storeInfo.storeName)
+        this.$set(this.attr.productSelect, 'image', this.storeInfo.image)
+        this.$set(this.attr.productSelect, 'price', this.storeInfo.price)
+        this.$set(this.attr.productSelect, 'stock', this.storeInfo.stock)
+        this.$set(this.attr.productSelect, 'integral', this.storeInfo.integral)
+        this.$set(this.attr.productSelect, 'unique', this.storeInfo.unique || '')
+        this.$set(this.attr.productSelect, 'cart_num', 1)
+        this.$set(this, 'attrValue', '')
+        this.$set(this, 'attrTxt', '请选择')
+      }
+    },
+    //购物车；
+    ChangeCartNum: function (changeValue) {
+      //changeValue:是否 加|减
+      //获取当前变动属性
+      let productSelect = this.productValue[this.attrValue]
+      //如果没有属性,赋值给商品默认库存
+      if (productSelect === undefined && !this.attr.productAttr.length) {
+        productSelect = this.attr.productSelect
+      }
+      //无属性值即库存为0；不存在加减；
+      if (productSelect === undefined) return
+      let stock = productSelect.stock || 0
+      let num = this.attr.productSelect
+      if (changeValue) {
+        num.cart_num++
+        if (num.cart_num > stock) {
+          this.$set(this.attr.productSelect, 'cart_num', stock)
+          this.$set(this, 'cart_num', stock)
+        } else {
+          this.$set(this.attr.productSelect, 'cart_num', num.cart_num)
+          this.$set(this, 'cart_num', num.cart_num)
+        }
+      } else {
+        num.cart_num--
+        if (num.cart_num < 1) {
+          this.$set(this.attr.productSelect, 'cart_num', 1)
+          this.$set(this, 'cart_num', 1)
+        } else {
+          this.$set(this.attr.productSelect, 'cart_num', num.cart_num)
+          this.$set(this, 'cart_num', num.cart_num)
+        }
+      }
+    },
+    //将父级向子集多次传送的函数合二为一；
+    changeFun: function (opt) {
+      if (typeof opt !== 'object') opt = {}
+      let action = opt.action || ''
+      let value = opt.value === undefined ? '' : opt.value
+      this[action] && this[action](value)
+    },
+    //打开优惠券插件；
+    couponTap: function () {
+      let that = this
+      that.coupons()
+      that.coupon.coupon = true
+    },
+    changecoupon: function (msg) {
+      this.coupon.coupon = msg
+      this.coupons()
+    },
+    currentcoupon: function (res) {
+      let that = this
+      that.coupon.coupon = false
+      that.$set(that.coupon.list[res], 'is_use', true)
+    },
+    //可领取优惠券接口；
+    coupons: function () {
+      let that = this,
+        q = {
+          page: 1,
+          limit: 20,
+        }
+      getCoupon(q).then(res => {
+        that.$set(that, 'couponList', res.data || [])
+        that.$set(that.coupon, 'list', res.data)
+      })
+    },
+    //打开属性插件；
+    selecAttrTap: function () {
+      this.attr.cartAttr = true
+      this.isOpen = true
+    },
+    changeattr: function (msg) {
+      // 修改了规格
+      console.log(msg)
+      this.attr.cartAttr = msg
+      this.isOpen = false
+    },
+    //选择属性；
+    ChangeAttr: function (res) {
+      // 修改了规格
+
+      let productSelect = this.productValue[res.value]
+      console.log(productSelect)
+      if (productSelect) {
+        this.attr.productAttr[res.indexw].index = res.indexn
+        this.$set(this.attr.productSelect, 'image', productSelect.image)
+        this.$set(this.attr.productSelect, 'price', productSelect.price)
+        this.$set(this.attr.productSelect, 'stock', productSelect.stock)
+        this.$set(this.attr.productSelect, 'unique', productSelect.unique)
+        this.$set(this.attr.productSelect, 'integral', productSelect.integral)
+        this.$set(this.attr.productSelect, 'cart_num', 1)
+        this.$set(this, 'attrValue', res.value)
+        this.$set(this, 'attrTxt', '已选择')
+      } else {
+        this.$set(this.attr.productSelect, 'image', this.storeInfo.image)
+        this.$set(this.attr.productSelect, 'price', this.storeInfo.price)
+        this.$set(this.attr.productSelect, 'integral', this.storeInfo.price)
+        this.$set(this.attr.productSelect, 'stock', 0)
+        this.$set(this.attr.productSelect, 'unique', '')
+        this.$set(this.attr.productSelect, 'cart_num', 0)
+        this.$set(this, 'attrValue', '')
+        this.$set(this, 'attrTxt', '请选择')
+      }
+    },
+    //收藏商品
+    setCollect: function () {
+      let that = this,
+        id = that.storeInfo.id,
+        category = 'collect'
+      if (that.storeInfo.userCollect) {
+        getCollectDel(id, category).then(function () {
+          that.storeInfo.userCollect = !that.storeInfo.userCollect
+        })
+      } else {
+        getCollectAdd(id, category).then(function () {
+          that.storeInfo.userCollect = !that.storeInfo.userCollect
+        })
+      }
+    },
+    //  点击加入购物车按钮
+    joinCart: function () {
+      //0=加入购物车
+      this.goCat(0)
+    },
+    // 加入购物车；
+    goCat: function (news) {
+      let that = this,
+        productSelect = that.productValue[this.attrValue]
+      //打开属性
+      if (that.attrValue) {
+        //默认选中了属性，但是没有打开过属性弹窗还是自动打开让用户查看默认选中的属性
+        that.attr.cartAttr = !that.isOpen ? true : false
+      } else {
+        if (that.isOpen) that.attr.cartAttr = true
+        else that.attr.cartAttr = !that.attr.cartAttr
+      }
+      //只有关闭属性弹窗时进行加入购物车
+      if (that.attr.cartAttr === true && that.isOpen === false) return (that.isOpen = true)
+      //如果有属性,没有选择,提示用户选择
+      if (that.attr.productAttr.length && productSelect === undefined && that.isOpen === true) {
+        uni.showToast({
+          title: '产品库存不足，请选择其它',
+          icon: 'none',
+          duration: 2000,
+        })
+        return
+      }
+      let q = {
+        productId: that.id,
+        cartNum: that.attr.productSelect.cart_num,
+        new: news,
+        uniqueId: that.attr.productSelect !== undefined ? that.attr.productSelect.unique : '',
+      }
+      postCartAdd(q)
+        .then(function (res) {
+          console.log(res)
+          that.isOpen = false
+          that.attr.cartAttr = false
+          if (news) {
+            if (!res.data) {
+              uni.showToast({
+                title: res.msg || res.data.msg || res.data.message,
+                icon: 'none',
+                duration: 2000,
+              })
+              return
+            }
+            that.$yrouter.push({
+              path: '/pages/order/OrderSubmission/index',
+              query: {
+                id: res.data.cartId,
+                isIntegral: that.isIntegral,
+              },
+            })
+          } else {
+            uni.showToast({
+              title: '添加购物车成功',
+              icon: 'success',
+              duration: 2000,
+              complete: () => {
+                that.getCartCount(true)
+              },
+            })
+          }
+        })
+        .catch(error => {
+          console.log(error)
+          that.isOpen = false
+          uni.showToast({
+            title: error.msg || error.response.data.msg || error.response.data.message,
+            icon: 'none',
+            duration: 2000,
+          })
+        })
+    },
+    //获取购物车数量
+    getCartCount: function (isAnima) {
+      let that = this
+      const isLogin = that.isLogin
+      if (isLogin) {
+        getCartCount({
+          numType: 0,
+        }).then(res => {
+          that.CartCount = res.data.count
+          //加入购物车后重置属性
+          if (isAnima) {
+            that.animated = true
+            setTimeout(function () {
+              that.animated = false
+            }, 500)
+          }
+        })
+      }
+    },
+    //立即购买；
+    tapBuy: function () {
+      //  1=直接购买
+      this.goCat(1)
+    },
+    listenerActionSheet: function () {
+      if (isWeixin() === true) {
+        this.weixinStatus = true
+      }
+      this.posters = true
+    },
+    listenerActionClose: function () {
+      this.posters = false
+    },
+    setOpenShare: function () {
+      var data = this.storeInfo
+      var href = this.location.href
+      if (this.$deviceType == 'weixin') {
+        if (this.isLogin) {
+          getUserInfo().then(res => {
+            href = href.indexOf('?') === -1 ? href + '?spread=' + res.data.uid : href + '&spread=' + res.data.uid
+            var configAppMessage = {
+              desc: data.storeInfo,
+              title: data.storeName,
+              link: href,
+              imgUrl: data.image,
+            }
+            wechatEvevt(['updateAppMessageShareData', 'updateTimelineShareData'], configAppMessage)
+              .then(res => {})
+              .catch(res => {
+                if (res.is_ready) {
+                  res.wx.updateAppMessageShareData(configAppMessage)
+                  res.wx.updateTimelineShareData(configAppMessage)
+                }
+              })
+          })
+        } else {
+          var configAppMessage = {
+            desc: data.storeInfo,
+            title: data.storeName,
+            link: href,
+            imgUrl: data.image,
+          }
+          wechatEvevt(['updateAppMessageShareData', 'updateTimelineShareData'], configAppMessage)
+            .then(res => {})
+            .catch(res => {
+              if (res.is_ready) {
+                res.wx.updateAppMessageShareData(configAppMessage)
+                res.wx.updateTimelineShareData(configAppMessage)
+              }
+            })
+        }
+      }
+    },
+  },
+}
+</script>
+
+<style scoped lang="less">
+.geoPage {
+  position: fixed;
+  width: 100%;
+  height: 100%;
+  top: 0;
+  z-index: 10000;
+}
+
+.product-con .store-info {
+  margin-top: 0.2 * 100rpx;
+  background-color: #fff;
+}
+
+.product-con .store-info .title {
+  padding: 0 0.3 * 100rpx;
+  font-size: 0.28 * 100rpx;
+  color: #282828;
+  height: 0.8 * 100rpx;
+  line-height: 0.8 * 100rpx;
+  border-bottom: 0.01 * 100rpx solid #f5f5f5;
+}
+
+.product-con .store-info .info {
+  padding: 0 0.3 * 100rpx;
+  height: 1.26 * 100rpx;
+}
+
+.product-con .store-info .info .picTxt {
+  width: 100%;
+  display: flex;
+  align-items: center;
+}
+
+.product-con .store-info .info .picTxt .pictrue {
+  width: 0.76 * 100rpx;
+  height: 0.76 * 100rpx;
+  margin-right: 0.2 * 100rpx;
+}
+
+.product-con .store-info .info .picTxt .pictrue image {
+  width: 100%;
+  height: 100%;
+  border-radius: 0.06 * 100rpx;
+}
+
+.product-con .store-info .info .picTxt .text {
+  flex: 1;
+}
+
+.product-con .store-info .info .picTxt .text .name {
+  font-size: 0.3 * 100rpx;
+  color: #282828;
+}
+
+.product-con .store-info .info .picTxt .text .address {
+  font-size: 0.24 * 100rpx;
+  color: #666;
+  margin-top: 0.03 * 100rpx;
+}
+
+.product-con .store-info .info .picTxt .text .address .iconfont {
+  color: #707070;
+  font-size: 0.18 * 100rpx;
+  margin-left: 0.1 * 100rpx;
+}
+
+.product-con .store-info .info .picTxt .addressBox {
+  display: flex;
+  flex-direction: column;
+  align-items: flex-end;
+}
+
+.product-con .store-info .info .picTxt .addressBox .iconfont {
+  font-size: 0.4 * 100rpx;
+}
+
+.product-con .store-info .info .picTxt .addressBox .addressTxt {
+  font-size: 0.24 * 100rpx;
+  color: #eb3729;
+}
+
+.product-con .store-info .praise {
+  font-size: 0.28 * 100rpx;
+  color: #808080;
+}
+
+.product-con .store-info .praise .iconfont {
+  font-size: 0.28 * 100rpx;
+}
+
+.product-con .superior {
+  background-color: #fff;
+  margin-top: 0.2 * 100rpx;
+}
+
+.product-con .superior .title {
+  height: 0.98 * 100rpx;
+}
+
+.product-con .superior .title image {
+  width: 0.3 * 100rpx;
+  height: 0.3 * 100rpx;
+}
+
+.product-con .superior .title .titleTxt {
+  margin: 0 0.2 * 100rpx;
+  font-size: 0.3 * 100rpx;
+  background-image: linear-gradient(to right, #f57a37 0%, #f21b07 100%);
+  background-image: -webkit-linear-gradient(to right, #f57a37 0%, #f21b07 100%);
+  background-image: -moz-linear-gradient(to right, #f57a37 0%, #f21b07 100%);
+  -webkit-background-clip: text;
+  -webkit-text-fill-color: transparent;
+}
+
+.product-con .superior .slider-banner {
+  width: 6.9 * 100rpx;
+  margin: 0 auto;
+  padding-bottom: 0.2 * 100rpx;
+}
+
+.product-con .superior .slider-banner .list {
+  width: 100%;
+  padding-bottom: 0.2 * 100rpx;
+}
+
+.product-con .superior .slider-banner .list .item {
+  width: 2.15 * 100rpx;
+  margin: 0 0.22 * 100rpx 0.3 * 100rpx 0;
+  font-size: 0.26 * 100rpx;
+}
+
+.product-con .superior .slider-banner .list .item:nth-of-type(3n) {
+  margin-right: 0;
+}
+
+.product-con .superior .slider-banner .list .item .pictrue {
+  width: 100%;
+  height: 2.15 * 100rpx;
+}
+
+.product-con .superior .slider-banner .list .item .pictrue image {
+  width: 100%;
+  height: 100%;
+  border-radius: 0.06 * 100rpx;
+}
+
+.product-con .superior .slider-banner .list .item .name {
+  color: #282828;
+  margin-top: 0.12 * 100rpx;
+}
+
+.product-con .superior .slider-banner .swiper-pagination-bullet {
+  background-color: #999;
+}
+
+.product-con .superior .slider-banner .swiper-pagination-bullet-active {
+  background-color: #e93323;
+}
+
+.mask {
+  -webkit-filter: blur(2px);
+  -moz-filter: blur(2px);
+  -ms-filter: blur(2px);
+  filter: blur(2px);
+}
+
+.product-con .product-intro .conter view {
+  width: 100% !important;
+}
+
+.generate-posters {
+  width: 100%;
+  height: 1.7 * 100rpx;
+  background-color: #fff;
+  position: fixed;
+  left: 0;
+  bottom: 0;
+  z-index: 99;
+  transform: translate3d(0, 100%, 0);
+  -webkit-transform: translate3d(0, 100%, 0);
+  -ms-transform: translate3d(0, 100%, 0);
+  -moz-transform: translate3d(0, 100%, 0);
+  -o-transform: translate3d(0, 100%, 0);
+  transition: all 0.3s cubic-bezier(0.25, 0.5, 0.5, 0.9);
+  -webkit-transition: all 0.3s cubic-bezier(0.25, 0.5, 0.5, 0.9);
+  -moz-transition: all 0.3s cubic-bezier(0.25, 0.5, 0.5, 0.9);
+  -o-transition: all 0.3s cubic-bezier(0.25, 0.5, 0.5, 0.9);
+}
+
+.generate-posters.on {
+  transform: translate3d(0, 0, 0);
+  -webkit-transform: translate3d(0, 0, 0);
+  -ms-transform: translate3d(0, 0, 0);
+  -moz-transform: translate3d(0, 0, 0);
+  -o-transform: translate3d(0, 0, 0);
+}
+
+.generate-posters .item {
+  flex: 50%;
+  -webkit-flex: 50%;
+  -ms-flex: 50%;
+  text-align: center;
+}
+
+.generate-posters .item .iconfont {
+  font-size: 0.8 * 100rpx;
+  color: #5eae72;
+}
+
+.generate-posters .item .iconfont.icon-haibao {
+  color: #5391f1;
+}
+
+.noscroll {
+  height: 100%;
+  overflow: hidden;
+}
+.product-con .footer {
+  .in-bnt {
+    width: auto;
+    flex: 1;
+    margin-left: 30rpx;
+    & > view {
+      width: 100%;
+      border-radius: 50rpx;
+    }
+  }
+}
+</style>
diff --git a/pages/user/User/index.vue b/pages/user/User/index.vue
index 59a0943..15e7128 100644
--- a/pages/user/User/index.vue
+++ b/pages/user/User/index.vue
@@ -114,11 +114,6 @@
                 <text class="iconfont icon-jiantou"></text>
               </view>
             </template>
-            <view class="item" @click="goPages2()">
-              <view class="pictrue"></view>
-              <view class="cell">积分商城</view>
-              <text class="iconfont icon-jiantou"></text>
-            </view>
           </view>
         </view>
       </view>