From af9da1d774f00d68570c795d6e4657da89e73981 Mon Sep 17 00:00:00 2001
From: wuhui_zzw <1760308791@qq.com>
Date: Mon, 13 Nov 2023 15:04:28 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=EF=BC=9A=E7=A7=AF=E5=88=86?=
 =?UTF-8?q?=E8=BD=AC=E6=8D=A2=E9=94=99=E8=AF=AF=E4=BF=A1=E6=81=AF=E4=B8=BA?=
 =?UTF-8?q?=E6=8F=90=E7=A4=BA=EF=BC=8C=E5=8F=AF=E8=83=BD=E5=AF=BC=E8=87=B4?=
 =?UTF-8?q?=E7=82=B9=E5=87=BB=E8=BD=AC=E6=8D=A2=E8=A1=A8=E5=8D=95=E6=97=A0?=
 =?UTF-8?q?=E6=95=88=20=E4=BF=AE=E5=A4=8D=EF=BC=9A=E5=BD=93=E5=89=8D?=
 =?UTF-8?q?=E7=A7=AF=E5=88=86=E5=8F=98=E6=9B=B4=E8=AE=B0=E5=BD=95=E6=A0=87?=
 =?UTF-8?q?=E9=A2=98=E8=BF=87=E9=95=BF=E6=97=B6=EF=BC=8C=E5=BD=93=E5=89=8D?=
 =?UTF-8?q?=E8=AE=B0=E5=BD=95=E6=A0=B7=E5=BC=8F=E9=94=99=E8=AF=AF=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 main.js                             | 4 ++--
 manifest.json                       | 4 ++--
 pages/users/user_integral/index.vue | 9 ++++++++-
 3 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/main.js b/main.js
index 7034f77..30fa579 100644
--- a/main.js
+++ b/main.js
@@ -27,8 +27,8 @@ let cookieName = "VCONSOLE",
 	query = parseQuery(),
 	urlSpread = query["spread"],
 	vconsole = query[cookieName.toLowerCase()],
-	md5Crmeb = "b14d1e9baeced9bb7525ab19ee35f2d2", //CRMEB MD5 加密开启vconsole模式
-	md5UnCrmeb = "3dca2162c4e101b7656793a1af20295c"; //UN_CREMB MD5 加密关闭vconsole模式
+	md5Crmeb = "b14d1e9baeced9bb7525ab19ee35f2d2", //MD5 加密开启vconsole模式
+	md5UnCrmeb = "3dca2162c4e101b7656793a1af20295c"; //MD5 加密关闭vconsole模式
 
 if (urlSpread !== undefined) {
 	var spread = Cache.get(SPREAD);
diff --git a/manifest.json b/manifest.json
index 8896ff5..78447fb 100644
--- a/manifest.json
+++ b/manifest.json
@@ -96,7 +96,7 @@
                 "share" : {
                     "weixin" : {
                         "appid" : "",
-                        "UniversalLinks" : "https://mer.crmeb.net/"
+                        "UniversalLinks" : ""
                     }
                 },
                 "geolocation" : {
@@ -112,7 +112,7 @@
                     "weixin" : {
                         "appid" : "",
                         "appsecret" : "",
-                        "UniversalLinks" : "https://mer.crmeb.net/"
+                        "UniversalLinks" : ""
                     }
                 },
                 "ad" : {}
diff --git a/pages/users/user_integral/index.vue b/pages/users/user_integral/index.vue
index 4625890..7f49d6c 100644
--- a/pages/users/user_integral/index.vue
+++ b/pages/users/user_integral/index.vue
@@ -32,7 +32,7 @@
 						<text class="tip-text">提示：您有部分积分将于{{userInfo.clear.nextClearDay}}过期，请尽快使用！</text>
 					</view>-->
 					<view class='item acea-row row-between-wrapper' v-for="(item,index) in integralList" :key="index">
-						<view>
+						<view class="item-title-and-time">
 							<view class='state'>{{item.mark}}</view>
 							<view>{{item.create_time}}</view>
 						</view>
@@ -334,6 +334,10 @@ export default {
           content: res.message,
         });
       }).catch(err => {
+        uni.showModal({
+          title: '提示',
+          content: err,
+        });
         console.log("错误 catch：",err);
       })
     }
@@ -569,6 +573,9 @@ page {
   height: 756rpx;
   overflow-y: scroll;
 }
+.item-title-and-time{
+  width: calc(100% - 200rpx) !important;
+}
 
 .mer-integral-list{
   width: 100vw;