From fd14ec6947a014f914868639ee3cb780e5dfae57 Mon Sep 17 00:00:00 2001
From: Gao xiaosong <704041637@qq.com>
Date: Fri, 24 Apr 2020 01:06:21 +0800
Subject: [PATCH] =?UTF-8?q?[bug]=E4=BF=AE=E6=94=B9=E5=95=86=E5=93=81?=
 =?UTF-8?q?=E8=AF=84=E8=AE=BA=20null=20=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/UserEvaluation.vue         |   2 +-
 manifest.json                         |   4 ++--
 myappSignKey.keystore                 | Bin 0 -> 2255 bytes
 pages/order/OrderSubmission/index.vue |   1 +
 4 files changed, 4 insertions(+), 3 deletions(-)
 create mode 100644 myappSignKey.keystore

diff --git a/components/UserEvaluation.vue b/components/UserEvaluation.vue
index 815c5e0..3e06530 100644
--- a/components/UserEvaluation.vue
+++ b/components/UserEvaluation.vue
@@ -10,7 +10,7 @@
           <view class="start" :class="'star' + item.star"></view>
         </view>
       </view>
-      <view class="time">{{ dataFormat(item.addTime) }} {{ item.suk }}</view>
+      <view class="time">{{ dataFormat(item.addTime) }} {{ item.suk||'' }}</view>
       <view class="evaluate-infor">{{ item.comment }}</view>
       <view class="imgList acea-row">
         <view class="pictrue" v-for="(itemn, eq) in item.picturesArr" :key="eq">
diff --git a/manifest.json b/manifest.json
index 47ae761..f1f3364 100644
--- a/manifest.json
+++ b/manifest.json
@@ -1,6 +1,6 @@
 {
     "name" : "yshopmall_uni",
-    "appid" : "",
+    "appid" : "__UNI__1EA8D79",
     "description" : "",
     "versionName" : "1.0.0",
     "versionCode" : "100",
@@ -57,7 +57,7 @@
             "sdkConfigs" : {
                 "oauth" : {
                     "weixin" : {
-                        "appid" : "",
+                        "appid" : "wx604d2ea4702620d2",
                         "appsecret" : "",
                         "UniversalLinks" : ""
                     }
diff --git a/myappSignKey.keystore b/myappSignKey.keystore
new file mode 100644
index 0000000000000000000000000000000000000000..d40aa265b906afcd308e36f4ad52d32e1fad4a78
GIT binary patch
literal 2255
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
Ob!}~yze_K>wfqO&#O2Ze

literal 0
HcmV?d00001

diff --git a/pages/order/OrderSubmission/index.vue b/pages/order/OrderSubmission/index.vue
index 43def2c..bcf25da 100644
--- a/pages/order/OrderSubmission/index.vue
+++ b/pages/order/OrderSubmission/index.vue
@@ -327,6 +327,7 @@
 		},
 		mounted: function() {
 			let that = this;
+			this.$store.dispatch('USERINFO', true)
 			that.getCartInfo();
 			if (that.$yroute.query.pinkid !== undefined)
 				that.pinkId = that.$yroute.query.pinkid;