From 2b4cb2cc88804df0219a39f1a0f10c83a37bb0b2 Mon Sep 17 00:00:00 2001
From: Chopper <liushuai711@gmail.com>
Date: Tue, 19 Apr 2022 10:40:46 +0800
Subject: [PATCH 1/4] =?UTF-8?q?=E7=A7=AF=E5=88=86=E5=91=BD=E5=90=8D?=
 =?UTF-8?q?=E5=B1=95=E7=A4=BA=E9=97=AE=E9=A2=98=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/mine/point/myPoint.vue | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pages/mine/point/myPoint.vue b/pages/mine/point/myPoint.vue
index f6df627..4753686 100644
--- a/pages/mine/point/myPoint.vue
+++ b/pages/mine/point/myPoint.vue
@@ -11,11 +11,11 @@
     <u-row class="portrait-box2">
       <u-col span="6" class="portrait-box2-col" :gutter="16">
         <text>累计获得：</text>
-        <text class="pcolor">{{ pointData.point || 0 }}</text>
+        <text class="pcolor">{{ pointData.totalPoint || 0 }}</text>
       </u-col>
       <u-col span="6" class="portrait-box2-col">
-        <text>未使用：</text>
-        <text class="pcolor">{{ pointData.variablePoint || 0 }}</text>
+        <text>剩余积分：</text>
+        <text class="pcolor">{{ pointData.point || 0 }}</text>
       </u-col>
     </u-row>
 

From c6e04bc4b9c1947081a4c89adb1d2b88ee1bae46 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?lemon=E6=A9=AA?= <17633066053@163.com>
Date: Tue, 19 Apr 2022 14:08:57 +0800
Subject: [PATCH 2/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BC=98=E6=83=A0?=
 =?UTF-8?q?=E5=88=B8=E6=98=BE=E7=A4=BA=E6=9C=89=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 config/config.js                              |   2 +-
 .../product/promotion/-promotion-coupon.vue   | 366 +++++++++---------
 2 files changed, 184 insertions(+), 184 deletions(-)

diff --git a/config/config.js b/config/config.js
index 11113ba..9624a59 100644
--- a/config/config.js
+++ b/config/config.js
@@ -6,7 +6,7 @@ export default {
   downloadLink: "https://pickmall.cn/download-page/index.html", //下载地址，下载app的地址
   shareLink: "https://m-b2b2c.pickmall.cn", //分享地址，也就是在h5中默认的复制地址
   appid: "wx6f10f29075dc1b0b", //小程序唯一凭证，即 AppID，可在「微信公众平台 - 设置 - 开发设置」页中获得。（需要已经成为开发者，且帐号没有异常状态）
-  aMapKey: "d649892b3937a5ad20b76dacb2bcb5bd", //在高德中申请web端key
+  aMapKey: "d649892b3937a5ad20b76dacb2bcb5bd", //在高德中申请Web服务key
   scanAuthNavigation:['https://m-b2b2c.pickmall.cn/'], //扫码认证跳转域名配置 会根据此处配置的路由进行跳转
   iosAppId:"id1564638363", //AppStore的应用地址id 具体在分享->拷贝链接中查看
   logo:"https://lilishop-oss.oss-cn-beijing.aliyuncs.com/4c864e133c2944efad1f7282ac8a3b9e.png", //logo地址
diff --git a/pages/product/product/promotion/-promotion-coupon.vue b/pages/product/product/promotion/-promotion-coupon.vue
index 4b1efae..0948a1e 100644
--- a/pages/product/product/promotion/-promotion-coupon.vue
+++ b/pages/product/product/promotion/-promotion-coupon.vue
@@ -1,184 +1,184 @@
-<template>
-  <view class="wrapper">
-    <div class="coupon-empty" v-if="!res">暂无优惠券</div>
-    <view class="coupon-List" v-for="(item, index) in couponRes" :key="index">
-      <view class="coupon-item">
-        <view class="top">
-          <div class="price">
-            <span v-if="item.couponType == 'DISCOUNT'">{{ item.couponDiscount }}折</span>
-            <span v-if="item.couponType == 'PRICE'">￥{{ item.price | unitPrice }}</span>
-          </div>
-          <view class="text">
-            <div class="coupon-List-title">
-              <view v-if="item.scopeType">
-                <span v-if="item.scopeType == 'ALL' && item.id == 'platform'"
-                  >全平台</span
-                >
-                <span v-if="item.scopeType == 'PORTION_CATEGORY'">仅限品类</span>
-                <view v-else
-                  >{{
-                    item.storeName == "platform" ? "全平台" : item.storeName + "店铺"
-                  }}使用</view
-                >
-              </view>
-            </div>
-            <div>满{{ item.consumeThreshold | unitPrice }}可用</div>
-          </view>
-          <view class="lingqu-btn" @click="getCoupon(item, index)">
-            <div :class="yhqFlag[index] ? 'cur' : ''">
-              {{ yhqFlag[index] ? "已领取或领完" : "立即领取" }}
-            </div>
-          </view>
-        </view>
-        <view class="line"></view>
-        <view class="time">{{ item.startTime }} - {{ item.endTime }}</view>
-      </view>
-    </view>
-  </view>
-</template>
-
-<script>
-export default {
-  data() {
-    return {
-      yhqFlag: [], //获取优惠券判断是否点击
-      couponRes: {},
-    };
-  },
-  props: {
-    res: {
-      type: null,
-      default: "",
-    },
-  },
-  watch: {
-    res: {
-      handler() {
-        if (this.res && this.res.length != 0) {
-          Object.keys(this.res).forEach((item) => {
-            let key = item.split("-")[0];
-            if (key === "COUPON") {
-              this.couponRes[item] = this?.res[item];
-            }
-          });
-        }
-      },
-      immediate: true,
-    },
-  },
-  methods: {
-    // 提交优惠券
-    getCoupon(item, index) {
-      this.yhqFlag[index] = true;
-      this.$emit("getCoupon", item);
-    },
-  },
-};
-</script>
-
-<style lang="scss" scoped>
-.coupon-item {
-  width: 100%;
-  height: 100%;
-  display: flex;
-  flex-direction: column;
-  justify-content: space-between;
-}
-.coupon-List {
-  display: flex;
-  flex-direction: column;
-  height: 230rpx;
-  background: #e9ebfb;
-  margin: 30rpx 0;
-  padding: 10rpx 30rpx;
-
-  .line {
-    height: 1px;
-    background: #fff;
-    margin: 0 20rpx;
-    position: relative;
-
-    &:before,
-    &:after {
-      content: "";
-      display: block;
-      width: 15rpx;
-      height: 30rpx;
-      background: #fff;
-      position: absolute;
-      top: -15rpx;
-    }
-
-    &:before {
-      left: -50rpx;
-    }
-
-    &:after {
-      right: -50rpx;
-    }
-  }
-
-  .time {
-    flex: 1;
-    font-size: 24rpx;
-    align-items: center;
-    display: flex;
-    align-items: center;
-  }
-}
-
-.top {
-  height: 140rpx;
-  display: flex;
-
-  .price {
-    width: 33%;
-    justify-content: center;
-    color: #6772e5;
-    font-size: 40rpx;
-    display: flex;
-
-    height: 100%;
-    align-items: center;
-    span {
-      font-size: 50rpx;
-    }
-  }
-
-  .text {
-    width: 33%;
-    display: flex;
-    flex-direction: column;
-    justify-content: center;
-    font-size: 26rpx;
-    color: 333;
-    margin-left: 40rpx;
-
-    .coupon-List-title {
-      font-size: 30rpx;
-      font-weight: bold;
-    }
-  }
-
-  .lingqu-btn {
-    display: flex;
-    align-items: center;
-    margin-left: 40rpx;
-    text {
-      width: 140rpx;
-      height: 40rpx;
-      text-align: center;
-      line-height: 40rpx;
-      color: #fff;
-      background: #6772e5;
-      border-radius: 5px;
-      font-size: 26rpx;
-
-      &.cur {
-        background: none;
-        transform: rotate(45deg) translate(10rpx, -46rpx);
-      }
-    }
-  }
-}
+<template>
+	<view class="wrapper">
+		<div class="coupon-empty" v-if="!res">暂无优惠券</div>
+		<view class="coupon-List" v-for="(item, index) in couponRes" :key="index">
+			<view class="coupon-item">
+				<view class="top">
+					<div class="price">
+						<span v-if="item.couponType == 'DISCOUNT'">{{ item.couponDiscount }}折</span>
+						<span v-if="item.couponType == 'PRICE'">￥{{ item.price | unitPrice }}</span>
+					</div>
+					<view class="text">
+						<div class="coupon-List-title">
+							<view v-if="item.scopeType">
+								<span v-if="item.scopeType == 'ALL' && item.id == 'platform'">全平台</span>
+								<span v-if="item.scopeType == 'PORTION_CATEGORY'">仅限品类</span>
+								<view v-else>{{
+                         item.storeName == "platform" ? "全平台" : item.storeName + "店铺"
+                       }}使用</view>
+							</view>
+						</div>
+						<div>满{{ item.consumeThreshold | unitPrice }}可用</div>
+					</view>
+					<view class="lingqu-btn" @click="getCoupon(item, index)">
+						<div :class="yhqFlag[index] ? 'cur' : ''">
+							{{ yhqFlag[index] ? "已领取或领完" : "立即领取" }}
+						</div>
+					</view>
+				</view>
+				<view class="line"></view>
+				<view class="time">{{ item.startTime / 1000 | unixToDate }} - {{ item.endTime / 1000 | unixToDate }}</view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				yhqFlag: [], //获取优惠券判断是否点击
+				couponRes: [],
+			};
+		},
+		props: {
+			res: {
+				type: null,
+				default: "",
+			},
+		},
+		watch: {
+			res: {
+				handler() {
+					if (this.res && this.res.length != 0) {
+						Object.keys(this.res).forEach((item) => {
+							let key = item.split("-")[0];
+							if (key === "COUPON") {
+								this.couponRes.push(this?.res[item]);
+
+							}
+						});
+					}
+				},
+				immediate: true,
+			},
+		},
+		methods: {
+			// 提交优惠券
+			getCoupon(item, index) {
+				this.yhqFlag[index] = true;
+				this.$emit("getCoupon", item);
+			},
+		},
+	};
+</script>
+
+<style lang="scss" scoped>
+	.coupon-item {
+		width: 100%;
+		height: 100%;
+		display: flex;
+		flex-direction: column;
+		justify-content: space-between;
+	}
+
+	.coupon-List {
+		display: flex;
+		flex-direction: column;
+		height: 230rpx;
+		background: #e9ebfb;
+		margin: 30rpx 0;
+		padding: 10rpx 30rpx;
+
+		.line {
+			height: 1px;
+			background: #fff;
+			margin: 0 20rpx;
+			position: relative;
+
+			&:before,
+			&:after {
+				content: "";
+				display: block;
+				width: 15rpx;
+				height: 30rpx;
+				background: #fff;
+				position: absolute;
+				top: -15rpx;
+			}
+
+			&:before {
+				left: -50rpx;
+			}
+
+			&:after {
+				right: -50rpx;
+			}
+		}
+
+		.time {
+			flex: 1;
+			font-size: 24rpx;
+			align-items: center;
+			display: flex;
+			align-items: center;
+		}
+	}
+
+	.top {
+		height: 140rpx;
+		display: flex;
+
+		.price {
+			width: 33%;
+			justify-content: center;
+			color: #6772e5;
+			font-size: 40rpx;
+			display: flex;
+
+			height: 100%;
+			align-items: center;
+
+			span {
+				font-size: 50rpx;
+			}
+		}
+
+		.text {
+			width: 33%;
+			display: flex;
+			flex-direction: column;
+			justify-content: center;
+			font-size: 26rpx;
+			color: 333;
+			margin-left: 40rpx;
+
+			.coupon-List-title {
+				font-size: 30rpx;
+				font-weight: bold;
+			}
+		}
+
+		.lingqu-btn {
+			display: flex;
+			align-items: center;
+			margin-left: 40rpx;
+
+			text {
+				width: 140rpx;
+				height: 40rpx;
+				text-align: center;
+				line-height: 40rpx;
+				color: #fff;
+				background: #6772e5;
+				border-radius: 5px;
+				font-size: 26rpx;
+
+				&.cur {
+					background: none;
+					transform: rotate(45deg) translate(10rpx, -46rpx);
+				}
+			}
+		}
+	}
 </style>

From 64686e165ff46e6822b535915940d41560c75e77 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?lemon=E6=A9=AA?= <17633066053@163.com>
Date: Thu, 21 Apr 2022 11:50:13 +0800
Subject: [PATCH 3/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=88=91=E7=9A=84?=
 =?UTF-8?q?=E8=AE=A2=E5=8D=95=E5=A4=9A=E6=AC=A1=E8=AF=B7=E6=B1=82bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/order/myOrder.vue | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pages/order/myOrder.vue b/pages/order/myOrder.vue
index 103595a..fccdc14 100644
--- a/pages/order/myOrder.vue
+++ b/pages/order/myOrder.vue
@@ -323,7 +323,7 @@ export default {
     } else {
       this.initData(0);
     }
-    this.loadData(this.status);
+    // this.loadData(this.status);
   },
   onShow() {
     if (this.tabCurrentIndex) {
@@ -331,7 +331,7 @@ export default {
     } else {
       this.initData(0);
     }
-    this.loadData(this.status);
+    // this.loadData(this.status);
   },
 
   onLoad(options) {
@@ -342,9 +342,9 @@ export default {
     let status = Number(options.status);
     this.status = status;
     this.tabCurrentIndex = status;
-    if (status == 0) {
-      this.loadData(status);
-    }
+    // if (status == 0) {
+    //   this.loadData(status);
+    // }
   },
 
   watch: {

From f87ec1866927d013c43a68a3e2defad6054f50e8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?lemon=E6=A9=AA?= <17633066053@163.com>
Date: Thu, 21 Apr 2022 11:58:34 +0800
Subject: [PATCH 4/4] =?UTF-8?q?=E5=88=A0=E9=99=A4=E4=BA=91=E6=99=BA?=
 =?UTF-8?q?=E6=9C=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 manifest.json | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/manifest.json b/manifest.json
index 05cd6a4..8bc9ebd 100644
--- a/manifest.json
+++ b/manifest.json
@@ -195,10 +195,6 @@
             }
         },
         "plugins" : {
-            "myPlugin" : {
-                "version" : "1.1.0",
-                "provider" : "wx738958e0f4c894f9"
-            },
             "live-player-plugin" : {
                 "version" : "1.3.0",
                 "provider" : "wx2b03c6e691cd7370"