From bedfd9113ee3ac3be9db127b83e6c0edc8139555 Mon Sep 17 00:00:00 2001
From: gaoxs <gaoxs@gaoxsdeMacBook-Pro.local>
Date: Tue, 11 Aug 2020 15:46:33 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=BF=AE=E6=94=B9=E5=A4=B4?=
 =?UTF-8?q?=E5=83=8F=E6=8F=90=E7=A4=BA=E6=8A=A5=E9=94=99=E7=9A=84=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98;=E4=BF=AE=E6=94=B9=E7=A7=AF=E5=88=86=E6=97=B6?=
 =?UTF-8?q?=E9=97=B4=E9=94=99=E8=AF=AF=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components/ProductWindow.vue          | 7 ++++++-
 pages/activity/GroupDetails/index.vue | 5 ++++-
 pages/user/PersonalData/index.vue     | 2 +-
 pages/user/signIn/Integral/index.vue  | 2 +-
 4 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/components/ProductWindow.vue b/components/ProductWindow.vue
index 2a522cd..186e945 100644
--- a/components/ProductWindow.vue
+++ b/components/ProductWindow.vue
@@ -9,7 +9,7 @@
           <view class="line1">{{ attr.productSelect.store_name }}</view>
           <view class="money font-color-red">
             ￥
-            <text class="num">{{ attr.productSelect.price+'' }}</text>
+            <text class="num">{{ attr.productSelect.price}}</text>
             <text class="stock">库存: {{ attr.productSelect.stock }}</text>
           </view>
         </view>
@@ -68,6 +68,11 @@ export default {
   mounted: function () {
     console.log(this);
   },
+  watch: {
+    attr(nextAttr) {
+      console.log(nextAttr);
+    },
+  },
   methods: {
     closeAttr: function () {
       this.$emit("changeFun", { action: "changeattr", value: false });
diff --git a/pages/activity/GroupDetails/index.vue b/pages/activity/GroupDetails/index.vue
index bfc32d3..278dea0 100644
--- a/pages/activity/GroupDetails/index.vue
+++ b/pages/activity/GroupDetails/index.vue
@@ -263,6 +263,7 @@ export default {
         that.posterData.price = that.storeInfo.price;
         that.posterData.code = that.storeInfo.code_base;
         that.domStatus = true;
+        console.log(this.storeInfo)
         //that.getImageBase64();
       });
     },
@@ -321,10 +322,12 @@ export default {
       var attr = that.attr;
       attr.productSelect.image = that.storeInfo.image;
       attr.productSelect.store_name = that.storeInfo.title;
-      attr.productSelect.price = that.storeInfo.price;
+      attr.productSelect.price = that.storeInfo.price+'';
       attr.productSelect.stock = that.storeInfo.stock;
       attr.cartAttr = false;
+      console.log(that.storeInfo)
       that.$set(that, "attr", attr);
+      console.log(this)
     },
     openTeam: function() {
       var that = this;
diff --git a/pages/user/PersonalData/index.vue b/pages/user/PersonalData/index.vue
index 2d59f80..7fe4181 100644
--- a/pages/user/PersonalData/index.vue
+++ b/pages/user/PersonalData/index.vue
@@ -166,7 +166,7 @@ export default {
       }).then(
         res => {
           this.$store.dispatch("userInfo", true);
-          this.$uni.showToast({
+          uni.showToast({
             title: res.msg,
             icon: "none",
             duration: 2000
diff --git a/pages/user/signIn/Integral/index.vue b/pages/user/signIn/Integral/index.vue
index 70f3188..a34d726 100644
--- a/pages/user/signIn/Integral/index.vue
+++ b/pages/user/signIn/Integral/index.vue
@@ -44,7 +44,7 @@
         >
           <view>
             <text class="state">{{ item.title }}</text>
-            <div>{{ dataFormat(item.addTime) }}</div>
+            <div>{{ item.createTime }}</div>
           </view>
           <text class="num" v-if="item.pm == 1">+{{ item.number }}</text>
           <text class="num font-color-red" v-if="item.pm == 0">-{{ item.number }}</text>