perf: 🎨 改善促销部分荣誉代码封装为组件使用更加便捷以及好看。优化部分页面显示问题

删除部分原有的老样式更新新版促销样式页面更加好看删除冗余代码封装多种方法以及组件
2025-12-18 08:25:55 +08:00 · 2022-09-15 15:40:50 +08:00
parent 8c8522c68e
commit 1e9df74034
70 changed files with 721 additions and 814 deletions
--- a/pages/cart/coupon/couponCenter.vue
+++ b/pages/cart/coupon/couponCenter.vue
@@ -145,7 +145,7 @@
 			},
 		},
 		onNavigationBarButtonTap(e) {
-			this.$navigateTo({
+			uni.navigateTo({
 				url: "/pages/cart/coupon/couponIntro",
 			});
 		},
--- a/pages/cart/coupon/myCoupon.vue
+++ b/pages/cart/coupon/myCoupon.vue
@@ -189,7 +189,7 @@ export default {
     */
    useItNow(item) {
      if (item.storeId && item.storeId!='0') {
-        this.$navigateTo({
+        uni.navigateTo({
          url: `/pages/product/shopPage?id=${item.storeId}`,
        });
      } else {
@@ -203,7 +203,7 @@ export default {
     * 优惠券详情
     */
    couponDetail(item) {
-      this.$navigateTo({
+      uni.navigateTo({
        url:
          "/pages/cart/coupon/couponDetail?item=" +
          encodeURIComponent(JSON.stringify(item)),
--- a/pages/cart/payment/payOrder.vue
+++ b/pages/cart/payment/payOrder.vue
@@ -120,7 +120,7 @@
 			 * 支付成功后跳转
 			 */
 			callback(paymentMethod){
-				this.$navigateTo({
+				uni.navigateTo({
 					url: "/pages/cart/payment/success?paymentMethod=" +
 					paymentMethod +
 					"&payPrice=" +
--- a/pages/mine/address/add.vue
+++ b/pages/mine/address/add.vue
@@ -162,7 +162,7 @@ export default {
            delete this.form.updateTime;
            editAddress(this.form).then((res) => {
              if (res.data.success) {
-                this.$navigateTo({
+                uni.navigateTo({
                  url: `/${beforePage.route}`,
                });
              }
--- a/pages/mine/address/address.vue
+++ b/pages/mine/address/address.vue
@@ -129,7 +129,7 @@ export default {
    //新建。编辑地址
    addAddress(id) {
      if (id) {
-        this.$navigateTo({
+        uni.navigateTo({
          url:
            "/pages/mine/address/add?id=" +
            id +
@@ -138,7 +138,7 @@ export default {
            "&type=order",
        });
      } else {
-        this.$navigateTo({
+        uni.navigateTo({
          url:
            "/pages/mine/address/add?way=" + this.routerVal.way + "&type=order",
        });
--- a/pages/mine/address/addressManage.vue
+++ b/pages/mine/address/addressManage.vue
@@ -86,23 +86,9 @@ export default {
   * 进入页面检测当前账户是否登录
   */
  onShow() {
-    let that = this;
-    if (this.$options.filters.isLogin("auth")) {
+    if (this.$options.filters.tipsToLogin()) {
      this.getAddressList();
-    } else {
-      uni.showModal({
-        title: "提示",
-        content: "检测到您的账号还未登录,是否去登录？",
-        confirmColor: this.$lightColor,
-        success: function (res) {
-          if (res.confirm) {
-            that.$options.filters.navigateToLogin();
-          } else if (res.cancel) {
-            uni.navigateBack();
-          }
-        },
-      });
-    }
+    } 
  },
  methods: {
    //获取地址列表
@@ -145,7 +131,7 @@ export default {
    },
    //新建。编辑地址
    addAddress(id) {
-      this.$navigateTo({
+      uni.navigateTo({
        url: `/pages/mine/address/add${id ? "?id=" + id : ""}`,
      });
    },
--- a/pages/mine/deposit/operation.vue
+++ b/pages/mine/deposit/operation.vue
@@ -50,7 +50,7 @@ export default {
     * 跳转
     */
    navgition(url) {
-      this.$navigateTo({
+      uni.navigateTo({
        url,
      });
    },
--- a/pages/mine/deposit/recharge.vue
+++ b/pages/mine/deposit/recharge.vue
@@ -38,7 +38,7 @@ export default {
       
        let res = await recharge({ price: this.price });
        if (res.data.success) {
-          this.$navigateTo({
+          uni.navigateTo({
            url: `/pages/cart/payment/payOrder?orderType=RECHARGE&recharge_sn=${res.data.result.rechargeSn}`,
          });
        }
--- a/pages/mine/distribution/home.vue
+++ b/pages/mine/distribution/home.vue
@@ -58,12 +58,12 @@ export default {
  },
  methods: {
    handleClick(url) {
-      this.$navigateTo({
+      uni.navigateTo({
        url,
      });
    },
    queryGoods(src) {
-      this.$navigateTo({
+      uni.navigateTo({
        url: `/pages/mine/distribution/${src}`,
      });
    },
--- a/pages/mine/distribution/list.vue
+++ b/pages/mine/distribution/list.vue
@@ -221,7 +221,7 @@ export default {
     * 查看图片
     */
    handleNavgationGoods(val) {
-      this.$navigateTo({
+      uni.navigateTo({
        url: `/pages/product/goods?id=${val.skuId}&goodsId=${val.goodsId}`,
      });
    },
--- a/pages/mine/msgTips/main.vue
+++ b/pages/mine/msgTips/main.vue
@@ -56,7 +56,7 @@
 		methods: {
 			...mapMutations(["logout"]),
 			navigateTo(url) {
-				this.$navigateTo({
+				uni.navigateTo({
 					url
 				});
 			},
--- a/pages/mine/msgTips/packageMsg/index.vue
+++ b/pages/mine/msgTips/packageMsg/index.vue
@@ -45,7 +45,7 @@ export default {
  },
  methods: {
    goDetail(sn,logi_id,ship_no){
-		this.$navigateTo({
+		uni.navigateTo({
 			url:'/pages/msgTips/packagemsg/logisticsDetail?order_sn=' + sn +'&logi_id='+logi_id+'&ship_no='+ship_no,
 		})
 	},
--- a/pages/mine/myCollect.vue
+++ b/pages/mine/myCollect.vue
@@ -174,7 +174,7 @@
 			 */
 			goGoodsDetail(val) {
 				//商品详情
-				this.$navigateTo({
+				uni.navigateTo({
 					url: "/pages/product/goods?id=" + val.skuId + "&goodsId=" + val.goodsId,
 				});
 			},
@@ -184,7 +184,7 @@
 			 */
 			goStoreMainPage(id) {
 				//店铺主页
-				this.$navigateTo({
+				uni.navigateTo({
 					url: "/pages/product/shopPage?id=" + id,
 				});
 			},
--- a/pages/mine/myTracks.vue
+++ b/pages/mine/myTracks.vue
@@ -84,7 +84,7 @@
 			 * 导航到店铺
 			 */
 			navgaiteToStore(val) {
-				this.$navigateTo({
+				uni.navigateTo({
 					url: "/pages/product/shopPage?id=" + val.storeId,
 				});
 			},
@@ -100,7 +100,7 @@
 			 * 跳转详情
 			 */
 			navgaiteToDetail(item) {
-				this.$navigateTo({
+				uni.navigateTo({
 					url: "/pages/product/goods?id=" + item.id + "&goodsId=" + item.goodsId,
 				});
 			},
--- a/pages/mine/set/editionIntro.vue
+++ b/pages/mine/set/editionIntro.vue
@@ -88,7 +88,7 @@ export default {
    },

    navigateTo(url) {
-      this.$navigateTo({
+      uni.navigateTo({
        url,
      });
    },
--- a/pages/mine/set/securityCenter/securityCenter.vue
+++ b/pages/mine/set/securityCenter/securityCenter.vue
@@ -16,7 +16,7 @@ export default {

  methods: {
    navigateTo(url) {
-      this.$navigateTo({
+      uni.navigateTo({
        url: url,
      });
    },
--- a/pages/mine/set/setUp.vue
+++ b/pages/mine/set/setUp.vue
@@ -49,7 +49,7 @@ export default {
      if (url == "/pages/set/securityCenter/securityCenter") {
        url += `?mobile=${this.userInfo.mobile}`;
      }
-      this.$navigateTo({
+      uni.navigateTo({
        url: url,
      });
    },
--- a/pages/navigation/search/searchPage.vue
+++ b/pages/navigation/search/searchPage.vue
@@ -488,13 +488,13 @@ export default {
    },
    // 跳转到商品详情
    navigateToDetailPage(item) {
-      this.$navigateTo({
+      uni.navigateTo({
        url: `/pages/product/goods?id=${item.content.id}&goodsId=${item.content.goodsId}`,
      });
    },
    // 跳转地址
    navigateToStoreDetailPage(item) {
-      this.$navigateTo({
+      uni.navigateTo({
        url: `/pages/product/shopPage?id=${item.content.storeId}`,
      });
    },
--- a/pages/order/afterSales/afterSales.vue
+++ b/pages/order/afterSales/afterSales.vue
@@ -352,7 +352,7 @@ export default {
     * 售后详情
     */
    afterDetails(order) {
-      this.$navigateTo({
+      uni.navigateTo({
        url: "./applyDetail?sn=" + order.sn,
      });
    },
@@ -395,7 +395,7 @@ export default {
        ...sku,
      };
      storage.setAfterSaleData(data);
-      this.$navigateTo({
+      uni.navigateTo({
        url: `/pages/order/afterSales/afterSalesSelect?sn=${sn}`,
      });
    },
@@ -411,7 +411,7 @@ export default {
      };

      storage.setAfterSaleData(data);
-      this.$navigateTo({
+      uni.navigateTo({
        url: `./afterSalesDetailExpress?serviceSn=${order.sn}`,
      });
    },
@@ -422,13 +422,13 @@ export default {
    onDetail(goods, sku) {
      // 售后申请
      if (this.current == 0) {
-        this.$navigateTo({
+        uni.navigateTo({
          url: `/pages/product/goods?id=${sku.skuId}&goodsId=${
            sku.goodsId || sku.goodsId
          }`,
        });
      } else {
-        this.$navigateTo({
+        uni.navigateTo({
          url: `/pages/product/goods?id=${goods.skuId}&goodsId=${
            goods.goodsId || goods.goodsId
          }`,
--- a/pages/order/afterSales/afterSalesSelect.vue
+++ b/pages/order/afterSales/afterSalesSelect.vue
@@ -94,7 +94,7 @@ export default {
     * 跳转到商品信息
     */
    navigateToGoodsDetail(id) {
-      this.$navigateTo({
+      uni.navigateTo({
        url: `/pages/product/goods?id=${id}&goodsId=${goodsId}`,
      });
    },
--- a/pages/order/afterSales/applyDetail.vue
+++ b/pages/order/afterSales/applyDetail.vue
@@ -381,7 +381,7 @@ export default {
     * 访问商品详情
     */
    navgiateToGoodsDetail(item) {
-      this.$navigateTo({
+      uni.navigateTo({
        url: `/pages/product/goods?id=${item.id}&goodsId=${item.goodsId}`,
      });
    },
@@ -390,7 +390,7 @@ export default {
     * 进度
     */
    onProgress() {
-      this.$navigateTo({
+      uni.navigateTo({
        url: `./applyProgress?sn=${
          this.serviceDetail.sn
        }&createTime=${encodeURIComponent(this.serviceDetail.createTime)}
--- a/pages/order/complain/complainList.vue
+++ b/pages/order/complain/complainList.vue
@@ -86,7 +86,7 @@ export default {
  methods: {
    // 点击跳转到商品
    handleToGoods(val) {
-      this.$navigateTo({
+      uni.navigateTo({
        url: "/pages/product/goods?id=" + val.skuId + "&goodsId=" + val.goodsId,
      });
    },
@@ -120,7 +120,7 @@ export default {
     * 查看详情
     */
    handleInfo(val) {
-      this.$navigateTo({
+      uni.navigateTo({
        url: "./complainInfo?id=" + val.id,
      });
    },
--- a/pages/order/evaluate/myEvaluate.vue
+++ b/pages/order/evaluate/myEvaluate.vue
@@ -219,7 +219,7 @@ export default {
     */
    talkCommont(sku) {
      console.log(sku);
-      this.$navigateTo({
+      uni.navigateTo({
        url: `./releaseEvaluate?sn=${sku.sn}&sku=${encodeURIComponent(
          JSON.stringify(sku)
        )}`,
@@ -270,7 +270,7 @@ export default {
     * 评价详情
     */
    onDetail(comment) {
-      this.$navigateTo({
+      uni.navigateTo({
        url:
          "./evaluateDetail?comment=" +
          encodeURIComponent(JSON.stringify(comment)),
--- a/pages/order/fillorder.vue
+++ b/pages/order/fillorder.vue
@@ -481,7 +481,7 @@ export default {

    // 跳转到店铺
    navigateToStore(val) {
-      this.$navigateTo({
+      uni.navigateTo({
        url: "/pages/product/shopPage?id=" + val.storeId,
      });
    },
@@ -555,7 +555,7 @@ export default {
     * 跳转
     */
    navigateTo(url) {
-      this.$navigateTo({
+      uni.navigateTo({
        url,
      });
    },
--- a/pages/order/myOrder.vue
+++ b/pages/order/myOrder.vue
@@ -326,10 +326,10 @@ export default {
    // this.loadData(this.status);
  },
  onShow() {
-    if (!this.tabCurrentIndex) {
-     this.initData(0);
-    } else {
-      
+    if(this.$options.filters.tipsToLogin()){
+      if (!this.tabCurrentIndex) {
+        this.initData(0);
+      }
    }
    // this.loadData(this.status);
  },
@@ -364,14 +364,14 @@ export default {
  methods: {
    // 售后
    applyService(order) {
-      this.$navigateTo({
+      uni.navigateTo({
        url: `/pages/order/afterSales/afterSales?orderSn=${order.sn}`,
      });
    },

    // 店铺详情
    navigateToStore(val) {
-      this.$navigateTo({
+      uni.navigateTo({
        url: "/pages/product/shopPage?id=" + val.storeId,
      });
    },
@@ -423,7 +423,7 @@ export default {
        }).pay();
        // #endif
        // #ifndef MP-WEIXIN
-        this.$navigateTo({
+        uni.navigateTo({
          url: "/pages/cart/payment/payOrder?order_sn=" + val.sn,
        });
        // #endif
@@ -522,7 +522,7 @@ export default {
     * 跳转到订单详情
     */
    navigateToOrderDetail(sn) {
-      this.$navigateTo({
+      uni.navigateTo({
        url: "./orderDetail?sn=" + sn,
      });
    },
@@ -588,7 +588,7 @@ export default {
     * 评价商品
     */
    onComment(sn) {
-      this.$navigateTo({
+      uni.navigateTo({
        url: "./evaluate/myEvaluate",
      });
    },
@@ -599,7 +599,7 @@ export default {
    reBuy(order) {
      console.log(order);
      return;
-      this.$navigateTo({
+      uni.navigateTo({
        url:
          "/pages/product/goods?id=" + order.id + "&goodsId=" + order.goodsId,
      });
@@ -609,7 +609,7 @@ export default {
     * 查看物流
     */
    navigateToLogistics(order) {
-      this.$navigateTo({
+      uni.navigateTo({
        url:
          "/pages/mine/msgTips/packageMsg/logisticsDetail?order_sn=" + order.sn,
      });
--- a/pages/order/orderDetail.vue
+++ b/pages/order/orderDetail.vue
@@ -277,7 +277,7 @@ export default {
  },
  methods: {
    tostore(val) {
-      this.$navigateTo({
+      uni.navigateTo({
        url: "/pages/product/shopPage?id=" + val.storeId,
      });
    },
@@ -294,7 +294,7 @@ export default {
    },
    // #TODO 这块需要写一下 目前没有拼团的详细信息
    ByUserMessage(order) {
-      this.$navigateTo({
+      uni.navigateTo({
        url:
          "/pages/cart/payment/shareOrderGoods?sn=" +
          order.sn +
@@ -318,12 +318,12 @@ export default {
      });
    },
    onReceipt(val) {
-      this.$navigateTo({
+      uni.navigateTo({
        url: "/pages/order/invoice/invoiceDetail?id=" + val.id,
      });
    },
    gotoGoodsDetail(sku) {
-      this.$navigateTo({
+      uni.navigateTo({
        url: `/pages/product/goods?id=${sku.skuId}&goodsId=${sku.goodsId}`,
      });
    },
@@ -363,7 +363,7 @@ export default {
     * 投诉
     */
    complaint(sku) {
-      this.$navigateTo({
+      uni.navigateTo({
        url:
          "/pages/order/complain/complain?sn=" +
          this.sn +
@@ -373,7 +373,7 @@ export default {
    },
    //售后按钮
    onAfterSales(sn, sku) {
-      this.$navigateTo({
+      uni.navigateTo({
        url: `./afterSales/afterSalesSelect?sn=${sn}&sku=${encodeURIComponent(
          JSON.stringify(sku)
        )}`,
@@ -382,7 +382,7 @@ export default {
    // 去支付
    toPay(val) {
      val.sn
-        ? this.$navigateTo({
+        ? uni.navigateTo({
            url: "/pages/cart/payment/payOrder?order_sn=" + val.sn,
          })
        : false;
@@ -459,12 +459,12 @@ export default {
    },
    //评价商品
    onComment(sn) {
-      this.$navigateTo({
+      uni.navigateTo({
        url: "./evaluate/myEvaluate",
      });
    }, //查看物流
    onLogistics(order) {
-      this.$navigateTo({
+      uni.navigateTo({
        url:
          "/pages/mine/msgTips/packageMsg/logisticsDetail?logi_id=" +
          order.logi_id +
@@ -480,7 +480,7 @@ export default {
      this.reason = reason;
    },
    reBuy(order) {
-      this.$navigateTo({
+      uni.navigateTo({
        url:
          "/pages/product/goods?id=" + order.id + "&goodsId=" + order.goodsId,
      });
--- a/pages/passport/login.vue
+++ b/pages/passport/login.vue
@@ -545,7 +545,7 @@ export default {
             if (user.data.result.mobile) {
                whetherNavigate();
              } else {
-                this.$navigateTo({
+                uni.navigateTo({
                  url: "/pages/passport/bindUserPhone",
                });
              }
@@ -639,13 +639,13 @@ export default {
    },
    // 跳转
    navigateToPrivacy(val) {
-      this.$navigateTo({
+      uni.navigateTo({
        url: "/pages/mine/help/tips?type=" + val,
      });
      console.log(val)
    },
    navigateToPrivacys(val){
-      this.$navigateTo({
+      uni.navigateTo({
        url:"/pages/mine/help/tips?type="+ val,
      })
    },
--- a/pages/product/goods.vue
+++ b/pages/product/goods.vue
@@ -710,13 +710,13 @@ export default {
    linkMsgDetail() {
      // lili 基础客服
 	
-	  this.$navigateTo({
+	  uni.navigateTo({
 		url: `/pages/tabbar/home/web-view?IM=${this.storeDetail.storeId}`,
 	  });
 		
 		// udesk 代码  
 		// if (this.storeDetail.merchantEuid) {
-		//   this.$navigateTo({
+		//   uni.navigateTo({
 		//     url: `/pages/tabbar/home/web-view?src=${this.IM}`,
 		//   });
 		// }
@@ -736,7 +736,7 @@ export default {
        //   sign: this.storeDetail.yzfSign,
        //   mpSign: this.storeDetail.yzfMpSign,
        // };
-        // this.$navigateTo({
+        // uni.navigateTo({
        //   url:
        //     "/pages/product/customerservice/index?params=" +
        //     encodeURIComponent(JSON.stringify(params)),
@@ -744,7 +744,7 @@ export default {
        // // #endif
        // // #ifndef MP-WEIXIN
        // const sign = this.storeDetail.yzfSign;
-        // this.$navigateTo({
+        // uni.navigateTo({
        //   url:
        //     "/pages/tabbar/home/web-view?src=https://yzf.qq.com/xv/web/static/chat/index.html?sign=" +
        //     sign,
@@ -908,7 +908,7 @@ export default {
     * 跳转到店铺页面
     */
    navigateToStore(store_id) {
-      this.$navigateTo({
+      uni.navigateTo({
        url: `/pages/product/shopPage?id=` + store_id,
      });
    },
--- a/pages/product/product/evaluation/-evaluation.vue
+++ b/pages/product/product/evaluation/-evaluation.vue
@@ -94,7 +94,7 @@ export default {
      );
    },
    toComment(id, grade) {
-      this.$navigateTo({
+      uni.navigateTo({
        url: `/pages/product/comment?id=${id}&grade=${grade}`,
      });
    },
--- a/pages/product/product/popup/address.vue
+++ b/pages/product/product/popup/address.vue
@@ -54,7 +54,7 @@ export default {
      this.getShippingAddress()
    }
    else{
-      this.$navigateTo({
+      uni.navigateTo({
         url: 'pages/passport/login'
      });
    }
@@ -71,7 +71,7 @@ export default {

    getpicker() {
      // this.$refs.cityPicker.show();
-      this.$navigateTo({
+      uni.navigateTo({
        url: "/pages/mine/address/add",
      });
      this.closeAddress();
--- a/pages/product/product/shop/-shop.vue
+++ b/pages/product/product/shop/-shop.vue
@@ -57,13 +57,13 @@ export default {
    },
    // 点击商品
    clickGoods(val) {
-      this.$navigateTo({
+      uni.navigateTo({
        url: `/pages/product/goods?id=${val.content.id}&goodsId=${val.content.goodsId}`,
      });
    },

    tostorePage(val) {
-      this.$navigateTo({
+      uni.navigateTo({
        url: "../product/shopPage?id=" + val.storeId,
      });
    },
--- a/pages/product/shopList.vue
+++ b/pages/product/shopList.vue
@@ -74,7 +74,7 @@ export default {
  },
  methods: {
    handleClickStore(val){
-      this.$navigateTo({
+      uni.navigateTo({
         url: `/pages/product/shopPage?id=${val.id}`
      });
    },
--- a/pages/product/shopPage.vue
+++ b/pages/product/shopPage.vue
@@ -152,7 +152,7 @@ export default {

  methods: {
    getStoreLicencePhoto() {
-      this.$navigateTo({
+      uni.navigateTo({
        url: `/pages/product/licencePhoto?id=${this.storeId}`,
      });
    },
@@ -190,7 +190,7 @@ export default {
      //   sign: this.storeInfo.yzfSign,
      //   mpSign: this.storeInfo.yzfMpSign,
      // };
-      // this.$navigateTo({
+      // uni.navigateTo({
      //   url:
      //     "/pages/product/customerservice/index?params=" +
      //     encodeURIComponent(JSON.stringify(params)),
@@ -198,14 +198,14 @@ export default {
      // // #endif
      // // #ifndef MP-WEIXIN
      // const sign = this.storeInfo.yzfSign;
-      // this.$navigateTo({
+      // uni.navigateTo({
      //   url:
      //     "/pages/tabbar/home/web-view?src=https://yzf.qq.com/xv/web/static/chat/index.html?sign=" +
      //     sign,
      // });
      // // #endif
 			
-			this.$navigateTo({
+			uni.navigateTo({
 			   url: `/pages/tabbar/home/web-view?IM=${this.storeId}`,
 			 });
    },
@@ -227,7 +227,7 @@ export default {

    /**商品分类中商品集合 */
    getCategoryGoodsList(val) {
-      this.$navigateTo({
+      uni.navigateTo({
        url: `/pages/product/shopPageGoods?title=${val.labelName}&id=${val.id}&storeId=${this.storeId}`,
      });
    },
@@ -237,7 +237,7 @@ export default {
     */
    search() {
 			console.log("点击")
-      this.$navigateTo({
+      uni.navigateTo({
        url: `/pages/navigation/search/searchPage?storeId=${this.storeId}&keyword=${this.keyword}`,
      });
    },
--- a/pages/promotion/bargain/detail.vue
+++ b/pages/promotion/bargain/detail.vue
@@ -3,7 +3,7 @@
    <u-navbar :custom-back="back" back-icon-color="#fff" :background="background" :border-bottom="false">
    </u-navbar>

-    <div class="wrapper">
+    <div class="wrapper-box">
      <!-- 砍价列表 -->
      <div class="box box1">
        <div class="bargain">
@@ -106,10 +106,6 @@
      <popupGoods ref="popupGoods" :buyMask="maskFlag" @closeBuy="closePopupBuy" :goodsDetail="bargainDetail"
        :goodsSpec="goodsSpec" v-if="bargainDetail.id " @handleClickSku="getGoodsDetail" />

-      <!-- 产品详情 -->
-      <div class=" box4">
-
-      </div>
    </div>
  </div>
 </template>
@@ -352,11 +348,11 @@ page {
  align-items: center;
  padding: 10rpx 0;
 }
-.wrapper {
-  background: url("https://lilishop-oss.oss-cn-beijing.aliyuncs.com/aac88f4e8eff452a8010af42c4560b04.png");
+.wrapper-box {
+  background: url("https://lili-system.oss-cn-beijing.aliyuncs.com/kanjia.png");
  background-repeat: no-repeat;
  background-size: 100% 100%;
-  height: 700rpx;
+  height: 506rpx;
  width: 100%;
 }

@@ -371,16 +367,16 @@ page {
  }
 }
 .box1 {
-  top: 750rpx;
+  top: 560rpx;
 }
 .box2 {
-  top: 770rpx;
+  top: 580rpx;
 }
 .box3 {
-  top: 790rpx;
+  top: 600rpx;
 }
 .box4 {
-  top: 810rpx;
+  top: 620  rpx;
  height: 200rpx;
 }
 .bargain-item {
--- a/pages/promotion/bargain/list.vue
+++ b/pages/promotion/bargain/list.vue
@@ -6,22 +6,7 @@
      <!-- 砍价列表 -->
      <div class="box">
        <!-- 已砍的商品 -->
-        <div class="bargain" v-if="bargainList.length!=0">
-          <div class="flex bargain-item" v-for="(item,index) in bargainList" :key="index">
-            <div class="goods-img">
-              <u-image width="150" height="150" :src="item.thumbnail"></u-image>
-            </div>
-            <div class="goods-config">
-              <div class="goods-title wes-2">
-                {{item.goodsName}}
-              </div>
-              <div class="flex goods-buy">
-                <div class="max-price">最低：<span>￥{{item.purchasePrice | unitPrice}}</span></div>
-                <div class="bargaining" @click="navigateToBargainDetail(item)">参与砍价</div>
-              </div>
-            </div>
-          </div>
-        </div>
+        <goodsTemplate type="kanJia" v-if="bargainList.length!=0" :res="bargainList" />
        <div class="bargain empty" v-else>
          <u-empty text="暂无活动" mode="list"></u-empty>
        </div>
@@ -32,7 +17,9 @@

 <script>
 import { getBargainList } from "@/api/promotions";
+import goodsTemplate from '@/components/m-goods-list/promotion'
 export default {
+  components:{goodsTemplate},
  data() {
    return {
      background: {
@@ -74,7 +61,7 @@ export default {

    // 跳转到砍价详情
    navigateToBargainDetail(val) {
-      this.$navigateTo({
+      uni.navigateTo({
        url: `/pages/promotion/bargain/detail?id=${val.id}`,
      });
    },
@@ -91,7 +78,7 @@ page {
  background: url("https://lili-system.oss-cn-beijing.aliyuncs.com/kanjia.png");
  background-repeat: no-repeat;
  background-size: 100% 100%;
-  height: 600rpx;
+  height: 506rpx;
  width: 100%;
 }

@@ -99,7 +86,7 @@ page {
  background: #fff;
  border-radius: 20rpx;
  position: relative;
-  top: 650rpx;
+  top: 560rpx;
  width: 94%;
  margin: 0 auto;
  > .bargain {
--- a/pages/promotion/bargain/log.vue
+++ b/pages/promotion/bargain/log.vue
@@ -67,7 +67,7 @@ export default {
    },
    // 跳转到砍价详情
    navigateToBargainDetail(val) {
-      this.$navigateTo({
+      uni.navigateTo({
        url: `/pages/promotion/bargain/detail?id=${val.kanjiaActivityGoodsId}`,
      });
    },
--- a/pages/promotion/joinGroup.vue
+++ b/pages/promotion/joinGroup.vue
@@ -1,155 +1,133 @@
 <template>
-  <view class="wrapper">
+	<view class="wrapper">
+		<u-navbar :border-bottom="false"  :title="title">
+			<!-- 中间 -->
+			<view class="slot-wrap container-wrap">
+				<view v-if="search">
+					<u-search @search="searchFun()" @custom="searchFun()" v-model="params.goodsName"></u-search>
+				</view>
+			</view>
+			<!-- 右侧 -->
+			<view slot="right">
+				<view style="margin-right: 24rpx;" @click="searchFlag()">
+					<view v-if="search">取消</view>
+					<u-icon v-if="!search" size="44rpx" name="search"></u-icon>
+				</view>
+			</view>
+		</u-navbar>
+		<!-- 顶部栏 -->
+		<div class='header-wraper'>
+			<image  src="/static/join-buy.png"></image>
+		</div>
+		<!-- 商品栏 -->
+		<div class="swiper">
+			<goodsTemplate v-if="goodsList.length" :res="goodsList" />
+			
+			<u-empty v-else style="margin-top:20%" text="暂无拼团活动" mode="data"></u-empty>
+		</div>

-    <u-navbar :border-bottom="false" :background="background" class="unavbar" :title="title">
-      <!-- 中间 -->
-      <view class="slot-wrap container-wrap">
-
-        <view v-if="search">
-          <u-search @search="searchFun()" @custom="searchFun()" v-model="params.goodsName"></u-search>
-        </view>
-
-      </view>
-      <!-- 右侧 -->
-      <view slot="right">
-        <view style="margin-right: 24rpx;" @click="searchFlag()">
-          <view v-if="search">取消</view>
-          <u-icon v-if="!search" size="44rpx" name="search"></u-icon>
-        </view>
-      </view>
-    </u-navbar>
-    <!-- 顶部栏 -->
-
-    <!-- 商品栏 -->
-    <div class="swiper">
-
-      <div v-if="groupBuy.length !=0">
-        <view class="view-item" v-for="(groupItem, groupIndex) in groupBuy" :key="groupIndex">
-          <view class="view-left">
-            <u-image border-radius="10" shape="square" :src="groupItem.thumbnail" width="186rpx" height="186rpx">
-
-              <view slot="error" style="font-size: 24rpx;">加载失败</view>
-            </u-image>
-          </view>
-          <view class="view-content">
-            <view class="view-content-name">
-              {{ groupItem.goodsName }}
-            </view>
-            <view class="view-content-bottom">
-              <view>
-                <view class="view-content-price">
-                  <!-- ￥{{groupItem.sales_price | unitPrice }} <span v-if="groupItem.point">+{{groupItem.point}}积分</span> -->
-                  ￥{{groupItem.price | unitPrice }}
-                </view>
-                <view class="view-content-original_price">
-                  ￥{{ groupItem.originalPrice | unitPrice }}
-                </view>
-              </view>
-
-              <view>
-                <view class="btn-group" @click="toHref(groupItem)"> 去拼团 </view>
-                <view class="buy-content">已售{{groupItem.num || 0}}件</view>
-              </view>
-            </view>
-          </view>
-        </view>
-        <u-loadmore bg-color='#f8f8f8' :status="status" />
-      </div>
-      <u-empty v-else style="margin-top:20%" text="暂无拼团活动" mode="data"></u-empty>
-
-    </div>
-
-  </view>
+	</view>
 </template>

 <script>
-import * as API_Promotions from "@/api/promotions";
-import * as API_Goods from "@/api/goods";
-export default {
-  components: {},
-  data() {
-    return {
-      status: "loadmore",
-      is_empty: false,
-      search: false,
-      title: "拼团活动",
-      background: {
-        backgroundColor: "#fff",
-      },
-      empty: false,
-      params: {
-        pageNumber: 1,
-        pageSize: 10,
-        categoryPath: "",
-        goodsName: "",
-      },
-      groupBuy: [],
-    };
-  },
-  mounted() {},
-  watch: {
-    search(val) {
-      val ? (this.title = "") : (this.title = "拼团活动");
-    },
-  },
-  onReachBottom() {
-    this.loadMore();
-  },
-  // 点击搜索按钮
-  onNavigationBarButtonTap(e) {
-    this.popupFlag = !this.popupFlag;
-  },
-  async onLoad() {
-    this.GET_AssembleGoods();
-  },
+	import * as API_Promotions from "@/api/promotions";
+	import * as API_Goods from "@/api/goods";
+	import goodsTemplate from '@/components/m-goods-list/promotion.vue'
+	export default {
+		components: {
+			goodsTemplate
+		},
+		data() {
+			return {
+				is_empty: false,
+				search: false,
+				title: "拼团活动",

-  methods: {
-    loadMore() {
-      this.params.pageNumber++;
-      this.GET_AssembleGoods();
-    },
-    searchFlag() {
-      this.search = !this.search;
-    },
+				empty: false,
+				params: {
+					pageNumber: 1,
+					pageSize: 10,
+					categoryPath: "",
+					goodsName: "",
+				},
+				goodsList: [],
+			};
+		},
+		mounted() {},
+		watch: {
+			search(val) {
+				val ? (this.title = "") : (this.title = "拼团活动");
+			},
+		},
+		onReachBottom() {
+			this.loadMore();
+		},
+		// 点击搜索按钮
+		onNavigationBarButtonTap(e) {
+			this.popupFlag = !this.popupFlag;
+		},
+		async onLoad() {
+			this.GET_AssembleGoods();
+		},

-    toHref(goods) {
-      this.$navigateTo({
-        url: `/pages/product/goods?id=${goods.skuId}&goodsId=${goods.goodsId}`,
-      });
-    },
-    searchFun() {
-      this.groupBuy = [];
-      this.GET_AssembleGoods();
-    },
-    // 请求拼团数据
-    GET_AssembleGoods() {
-      this.status = "loading";
-      const params = JSON.parse(JSON.stringify(this.params));
-      if (params.category_id === 0) delete params.category_id;
+		methods: {
+			loadMore() {
+				this.params.pageNumber++;
+				this.GET_AssembleGoods();
+			},
+			searchFlag() {
+				this.search = !this.search;
+			},

-      API_Promotions.getAssembleList(params)
-        .then((response) => {
-          const data = response.data.result.records;
+			toHref(goods) {
+				uni.navigateTo({
+					url: `/pages/product/goods?id=${goods.skuId}&goodsId=${goods.goodsId}`,
+				});
+			},
+			searchFun() {
+				this.goodsList = [];
+				this.GET_AssembleGoods();
+			},
+			// 请求拼团数据
+			GET_AssembleGoods() {

-          if (!data || !data.length) {
-            this.is_empty = true;
-            this.status = "nomore";
-          } else {
-            if (data.length <= this.params.pageSize) {
-              this.status = "nomore";
-            } else {
-              this.status = "loadmore";
-            }
-            this.is_empty = false;
-            this.groupBuy.push(...(data || []));
-          }
-        })
-        .catch(() => {});
-    },
-  },
-};
+				const params = JSON.parse(JSON.stringify(this.params));
+				if (params.category_id === 0) delete params.category_id;
+
+				API_Promotions.getAssembleList(params)
+					.then((response) => {
+						const data = response.data.result.records;
+
+						if (!data || !data.length) {
+							this.is_empty = true;
+
+						} else {
+							if (data.length <= this.params.pageSize) {
+
+							} else {
+
+							}
+							this.is_empty = false;
+							this.goodsList.push(...(data || []));
+						}
+					})
+					.catch(() => {});
+			},
+		},
+	};
 </script>

 <style lang="scss" scoped>
-@import "./style.scss";
+	.header-wraper {
+		background: url('/static/bg.png');
+		height: 200rpx;
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		>image{
+			width: 188rpx;
+			height: 60rpx;
+		}
+	}
+	
 </style>
--- a/pages/promotion/lives.vue
+++ b/pages/promotion/lives.vue
@@ -229,7 +229,7 @@ export default {
      let customParams = encodeURIComponent(
        JSON.stringify({ path: "pages/index/index", pid: 1 })
      ); // 开发者在直播间页面路径上携带自定义参数，后续可以在分享卡片链接和跳转至商详页时获取，详见【获取自定义参数】、【直播间到商详页面携带参数】章节（上限600个字符，超过部分会被截断）
-      this.$navigateTo({
+      uni.navigateTo({
        url:
          "plugin-private://wx2b03c6e691cd7370/pages/live-player-plugin?room_id=" +
          roomId +
--- a/pages/promotion/point/pointList.vue
+++ b/pages/promotion/point/pointList.vue
@@ -23,8 +23,8 @@
                  <u-loading slot="loading"></u-loading>
                </u-image>
                <view class="index-item-title">{{ item.goodsName }}</view>
-                <view class="index-item-price">
-                  {{ item.points }}积分
+                <view class="index-item-price flex flex-a-c flex-j-sb">
+                  <div class="point"><span>{{ item.points }}</span>积分</div> 
                  <span class="tipsMkt">¥{{ item.originalPrice | unitPrice }}</span>
                </view>
              </view>
@@ -137,14 +137,14 @@ export default {
  methods: {
    // 跳转
    navigateTo(url) {
-      this.$navigateTo({
+      uni.navigateTo({
        url,
      });
    },

    toGoods(item) {
      //跳转详情
-      this.$navigateTo({
+      uni.navigateTo({
        url: `/pages/promotion/point/detail?id=${item.id}`,
      });
    },
@@ -194,46 +194,12 @@ page {
  height: 100%;
 }
 .tipsMkt {
-  float: right;
  color: #c0c4cc;
-  font-size: 24rpx;
+  font-size: 24rpx !important;
  text-decoration: line-through;
-  margin-right: 20rpx;
+  margin-right: 20rpx !important;
 }

-.header {
-  background: $light-color;
-  position: relative;
-  color: #fff;
-  display: flex;
-  height: 80rpx;
-  align-items: center;
-  justify-content: center;
-  font-size: 26rpx;
-  font-size: 34rpx;
-
-  .left,
-  .right {
-    position: absolute;
-    width: max-content;
-    height: max-content;
-    top: 0;
-    bottom: 0;
-    margin: auto;
-  }
-
-  .left {
-    float: left;
-    top: 0;
-    bottom: 0;
-    left: 20rpx;
-  }
-
-  .right {
-    float: right;
-    right: 20rpx;
-  }
-}

 .index {
  height: 100vh;
@@ -341,15 +307,19 @@ page {
  overflow: hidden;
 }

-.index-item-title-desc {
-  font-size: 25rpx;
-  color: #999999;
-  margin-top: 10rpx;
-}
+

 .index-item-price {
  font-size: 28rpx;
-  color: #ff5a10;
+  overflow: hidden;
+  color: $main-color;
  padding: 20rpx 0 0 20rpx;
+  >.point{
+    >span{
+      font-size: 42rpx;
+      font-weight: bold;
+      margin-right:10rpx;
+    }
+  }
 }
 </style>
--- a/pages/promotion/seckill.vue
+++ b/pages/promotion/seckill.vue
@@ -1,7 +1,8 @@
 <template>
-	<view class="sale">
-		<view class="sale-head">
-			<image src="@/pages/promotion/static/head-sample.png"></image>
+	<view class="sale">
+		<u-navbar title='限时抢购'></u-navbar>
+		<view class="header-wraper">
+				<image mode="widthFix" src="/static/seckill.png"></image>
 		</view>
 		<scroll-view scroll-x>
 			<view class="index-navs">
@@ -14,10 +15,7 @@
 					</view>
 				</view>
 			</view>
-			<view class="trailer" v-if="timeLine[nav] && times">
-				{{ timeLine[nav].distanceStartTime === 0 ? (onlyOne ? '距结束' : '距下一轮') : '距开始' }}
-				{{ times.hours == '00' ? '0' : times.hours }}小时{{ times.minutes }}分{{ times.seconds }}秒
-			</view>
+			
 		</scroll-view>
 		<view class="sale-items" v-if="goodsList.length > 0">
 			<goodsTemplate :res="goodsList" />
@@ -39,7 +37,7 @@
 		getSeckillTimeGoods
 	} from "@/api/promotions.js";
 	import Foundation from "@/utils/Foundation.js";
-	import goodsTemplate from '@/components/m-goods-list/seckill.vue'
+	import goodsTemplate from '@/components/m-goods-list/promotion.vue'
 	export default {
 		components: {
 			goodsTemplate
@@ -184,10 +182,15 @@
 		}
 	}

-	.sale-head {
-		image {
-			width: 100%;
-			height: 280rpx;
+	.header-wraper {
+		background: url('/static/bg.png');
+		height: 200rpx;
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		>image{
+			width: 300rpx;
+			height: 100rpx;
 		}
 	}

@@ -195,22 +198,8 @@
 		padding-top: 20rpx;
 	}

-	.trailer {
-		height: 100rpx;
-		background: #ffffff;
-		display: -webkit-box;
-		display: -webkit-flex;
-		display: flex;
-		justify-content: center;
-		align-items: center;
-		font-size: 22rpx;
-		color: #666666;
-		box-sizing: border-box;
-		position: relative;
-		z-index: 0;
-	}
-
-	.index-navs {
+	.index-navs {
+		background: #fff;
 		background-color: #f7f7f7;
 		display: -webkit-box;
 		display: -webkit-flex;
@@ -240,24 +229,26 @@
 		color: #bababa;
 		height: 115rpx;
 		line-height: 1em;
-		position: relative;
+		position: relative;
+		font-size: 32rpx;
+		font-weight: bold;

 		&-active {
-			background-image: url(/static/seckill/active.png);
-			background-size: 100% 115rpx;
-			background-repeat: no-repeat;
-			color: #ffffff;
+			color: $main-color;
 			position: relative;
-			z-index: 30;
-
+			z-index: 30;
 			.index-nav-desc {
-				color: #ffffff;
+				color: #fff;
+				font-weight: bold;
+				background: $main-color;
+				padding: 6rpx 16rpx;
+				border-radius: 50px;
 			}
 		}
 	}

 	.index-nav-desc {
-		margin-top: 8rpx;
+		margin-top: 8rpx;
 		font-size: 22rpx;
 		color: #bababa;
 	}
--- a/pages/tabbar/cart/cartList.vue
+++ b/pages/tabbar/cart/cartList.vue
@@ -343,7 +343,7 @@ export default {
     * 跳转到店铺
     */
    navigateToStore(val) {
-      this.$navigateTo({
+      uni.navigateTo({
        url: "/pages/product/shopPage?id=" + val.storeId,
      });
    },
@@ -352,7 +352,7 @@ export default {
     * 跳转到优惠券
     */
    navigateToConpon(val) {
-      this.$navigateTo({
+      uni.navigateTo({
        url: "/pages/cart/coupon/couponCenter?storeId=" + val.storeId,
      });
    },
@@ -361,7 +361,7 @@ export default {
     * 跳转到商品
     */
    navigateToGoods(val) {
-      this.$navigateTo({
+      uni.navigateTo({
        url:
          "/pages/product/goods?id=" +
          val.goodsSku.id +
@@ -437,7 +437,7 @@ export default {
     * 跳转
     */
    navigateTo(url) {
-      this.$navigateTo({
+      uni.navigateTo({
        url,
      });
    },
--- a/pages/tabbar/category/category.vue
+++ b/pages/tabbar/category/category.vue
@@ -57,7 +57,7 @@ export default {
     * 查询
     */
    search() {
-      this.$navigateTo({
+      uni.navigateTo({
        url: "/pages/navigation/search/searchPage",
      });
    },
@@ -90,7 +90,7 @@ export default {
    },

    navigateToList(sid, tid) {
-      this.$navigateTo({
+      uni.navigateTo({
        url: `/pages/navigation/search/searchPage?category=${tid}`,
      });
    },
--- a/pages/tabbar/home/template/tpl_goods.vue
+++ b/pages/tabbar/home/template/tpl_goods.vue
@@ -24,7 +24,9 @@
            {{ item.title }}
          </div>
          <div class="goods-bottom">
-            <div class="goods-price">￥{{ item.price | unitPrice }}</div>
+            <div class="goods-price">	¥<span>{{ formatPrice(item.price )[0] }} </span>.{{
+										formatPrice(item.price )[1]
+									}}</div>
          </div>
        </div>
      </div>
@@ -56,8 +58,15 @@ export default {
  },
  mounted() {},
  methods: {
+    	// 格式化金钱  1999 --> [1999,00]
+			formatPrice(val) {
+				if (typeof val == "undefined") {
+					return val;
+				}
+				return val.toFixed(2).split(".");
+			},
    handleClick(item) {
-      this.$navigateTo({
+      uni.navigateTo({
        url: `/pages/product/goods?id=${item.id}&goodsId=${item.goodsId}`,
      });
    },
@@ -163,13 +172,11 @@ $w_94: 94%;
    > .goods-price {
      line-height: 2;
      color: $main-color;
+      >span{
+        font-size: 42rpx;
+      }
    }
  }
 }

-.goods-icon {
-  right: 10rpx;
-  top: 10rpx;
-  position: absolute;
-}
 </style>
--- a/pages/tabbar/home/template/tpl_promotions_detail.vue
+++ b/pages/tabbar/home/template/tpl_promotions_detail.vue
@@ -147,22 +147,22 @@ export default {
    goToDetail(type) {
      switch(type) {
        case "SECKILL":
-          this.$navigateTo({
+          uni.navigateTo({
            url: `/pages/promotion/seckill`,
          });
          break;
        case "PINTUAN":
-          this.$navigateTo({
+          uni.navigateTo({
            url: `/pages/promotion/joinGroup`,
          });
          break;
        case "LIVE":
-          this.$navigateTo({
+          uni.navigateTo({
            url: `/pages/promotion/lives`,
          });
          break;
        case "KANJIA":
-          this.$navigateTo({
+          uni.navigateTo({
            url: `/pages/promotion/bargain/list`,
          });
          break;
--- a/pages/tabbar/home/template/tpl_search.vue
+++ b/pages/tabbar/home/template/tpl_search.vue
@@ -12,7 +12,7 @@ export default {
  props: ["res"],
  methods: {
    handleSearch() {
-      this.$navigateTo({
+      uni.navigateTo({
        url: "/pages/navigation/search/searchPage",
      });
    },
--- a/pages/tabbar/home/views.vue
+++ b/pages/tabbar/home/views.vue
@@ -150,18 +150,18 @@ export default {
          // WX_CODE 为小程序码
          if (res.scanType == "WX_CODE") {
            console.log(res);
-            this.$navigateTo({
+            uni.navigateTo({
              url: `/${res.path}`,
            });
          } else {
            config.scanAuthNavigation.forEach((src) => {
              if (res.result.indexOf(src) != -1) {
-                this.$navigateTo({
+                uni.navigateTo({
                  url: `/${res.result.substring(src.length)}`,
                });
              } else {
                setTimeout(() => {
-                  this.$navigateTo({
+                  uni.navigateTo({
                    url: "/pages/tabbar/home/web-view?src=" + path,
                  });
                }, 100);
--- a/pages/tabbar/screen/fullScreen.vue
+++ b/pages/tabbar/screen/fullScreen.vue
@@ -45,14 +45,14 @@ export default {
  //   },
  methods: {
    gotoLink() {
-      this.$navigateTo({
+      uni.navigateTo({
        //点击跳转到浏览器
        url:
          "/pages/tabbar/home/web-view?src=https://pc-b2b2c.pickmall.cn/article/detail?id=1371992704333905920",
      });
    },
    gotoB() {
-      this.$navigateTo({
+      uni.navigateTo({
        url:
          "/pages/tabbar/home/web-view?src=https://pc-b2b2c.pickmall.cn/article/detail?id=1371779927900160000",
      });
--- a/pages/tabbar/user/my.vue
+++ b/pages/tabbar/user/my.vue
@@ -122,7 +122,7 @@ export default {
     * navigator标签现在默认没有转场动画，所以用view
     */
    navigateTo(url) {
-      this.$navigateTo({
+      uni.navigateTo({
        url,
      });
    },
--- a/pages/tabbar/user/similarGoods.vue
+++ b/pages/tabbar/user/similarGoods.vue
@@ -73,7 +73,7 @@
 				})
 			},
 			goDetail(item) {
-				this.$navigateTo({
+				uni.navigateTo({
 					url: '/pages/product/goods?id=' + item.content.id + "&goodsId=" +item.content.goodsId
 				})
 			},
--- a/pages/tabbar/user/utils/tool.vue
+++ b/pages/tabbar/user/utils/tool.vue
@@ -69,7 +69,7 @@ import { distribution } from "@/api/goods";
 export default {
  methods: {
    navigateTo(url) {
-      this.$navigateTo({
+      uni.navigateTo({
        url,
      });
    },
@@ -78,11 +78,11 @@ export default {
        if (res.data.result) {
          let type = res.data.result.distributionStatus;
          if (type == "PASS") {
-            this.$navigateTo({
+            uni.navigateTo({
              url: "/pages/mine/distribution/home",
            });
          } else if (type == "REFUSE") {
-            this.$navigateTo({
+            uni.navigateTo({
              url: "/pages/mine/distribution/auth",
            });
          } else if (type == "RETREAT") {
@@ -106,7 +106,7 @@ export default {
          });
        } else {
          // 没有资格申请 先去实名认证
-          this.$navigateTo({
+          uni.navigateTo({
            url: "/pages/mine/distribution/auth",
          });
        }