bug优化

crmeb_src/mer_java/crmeb-admin/src/main/java/com/zbkj/admin/controller/publicly/PayCallbackController.java

@@ -74,6 +74,7 @@ public class PayCallbackController {
         return callbackService.aliPayCallback(request);
     }
 
+    // 代币充值
     @ApiOperation(value = "代币支付回调 ")
     @RequestMapping(value = "/daibi/pay", method = RequestMethod.POST)
     public String daibiPay(@RequestBody Map<String, Object> params){

crmeb_src/mer_java/crmeb-front/src/main/resources/application-dev.yml

@@ -41,5 +41,5 @@ spring:
         time-between-eviction-runs: -1 #逐出扫描的时间间隔(毫秒) 如果为负数,则不运行逐出线程, 默认-1
 
 daibi:
-  url: http://110.41.171.203:9000/wallet-api
+  url: http://47.86.47.82:9000/wallet-api
   apiKey: 2ee48a7898a0bc9d4eac60b71b606fe32710d5d32a3e1522685e6031e0bbde84

crmeb_src/mer_mer_admin/src/views/dashboard/components/baseInfo.vue

@@ -41,15 +41,24 @@
         <el-card :bordered="false" dis-hover shadow="never" :padding="12">
           <div class="acea-row row-between-wrapper">
             <div class="acea-row align-center">
-              <span class="main_tit">访客数</span>
+              <span class="main_tit">访客/粉丝</span>
             </div>
             <el-tag type="primary">今日</el-tag>
           </div>
           <div class="content" v-if="viewData">
-            <span class="content-number spBlock my15">{{ viewData.visitorsNum || 0 }}</span>
+            <div class="acea-row row-between-wrapper my15">
+              <div class="acea-row flex-column">
+                <span class="content-number">{{ viewData.visitorsNum || 0 }}</span>
+                <span class="content-time">访客数</span>
+              </div>
+              <div class="acea-row flex-column align-end">
+                <span class="content-number">{{ viewData.followNum || 0 }}</span>
+                <span class="content-time">粉丝数</span>
+              </div>
+            </div>
             <el-divider></el-divider>
-            <div class="acea-row row-between-wrapper">
-              <span class="content-time">昨日数据</span>
+            <div class="acea-row row-between-wrapper" style="margin-top: -15px;">
+              <span class="content-time">昨日访客</span>
               <span class="content-time">{{ viewData.yesterdayVisitorsNum || 0 }} 人</span>
             </div>
           </div>
@@ -59,13 +68,21 @@
         <el-card :bordered="false" dis-hover shadow="never" :padding="12">
           <div class="acea-row row-between-wrapper">
             <div class="acea-row align-center">
-              <span class="main_tit">粉丝数</span>
+              <span class="main_tit">商户账况</span>
             </div>
           </div>
-          <div class="container" v-if="viewData">
-            <div class="con_left">
-              <span class="content-number spBlock m-b-15">{{ viewData.followNum || 0 }}</span>
-              <span class="main_tit">关注量</span>
+          <div class="balance-grid" v-if="transferBaseInfo">
+            <div class="balance-item">
+              <p class="num_data">{{ transferBaseInfo.balance || '-' }}</p>
+              <p class="label">商户余额({{ $globalVars.priceUnit }})</p>
+            </div>
+            <div class="balance-item">
+              <p class="num_data yellow">{{ transferBaseInfo.transferBalance || '-' }}</p>
+              <p class="label">可提现金额({{ $globalVars.priceUnit }})</p>
+            </div>
+            <div class="balance-item">
+              <p class="num_data gray">{{ transferBaseInfo.freezeAmount || '-' }}</p>
+              <p class="label">冻结金额({{ $globalVars.priceUnit }})</p>
             </div>
           </div>
         </el-card>
@@ -83,11 +100,14 @@
 // +----------------------------------------------------------------------
 // | Author: CRMEB Team <admin@crmeb.com>
 // +----------------------------------------------------------------------
-
+import {
+  closingBaseInfoApi
+} from '@/api/finance';
 import { viewModelApi } from '@/api/dashboard';
 export default {
   data() {
     return {
+      transferBaseInfo: {},
       grid: { xl: 12, lg: 6, md: 12, sm: 12, xs: 24 },
       viewData: {},
     };
@@ -98,9 +118,16 @@ export default {
         this.viewData = res;
       });
     },
+    getMerInfo() {
+      closingBaseInfoApi()
+      .then((res) => {
+        this.transferBaseInfo = res;
+      })
+    },
   },
   mounted() {
     this.statisticsOrder();
+    this.getMerInfo();
   },
 };
 </script>
@@ -191,4 +218,38 @@ export default {
 .m-b-15 {
   margin-bottom: 15px;
 }
+.align-end {
+  align-items: flex-end;
+}
+.flex-column {
+  flex-direction: column;
+}
+.balance-grid {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  padding: 30px 0 0;
+  .balance-item {
+    flex: 1;
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    .num_data {
+      font-size: 24px;
+      font-weight: 600;
+      color: #333;
+      margin-bottom: 15px;
+      &.yellow {
+        color: #E6A23C;
+      }
+      &.gray {
+        color: #909399;
+      }
+    }
+    .label {
+      font-size: 14px;
+      color: #666;
+    }
+  }
+}
 </style>

crmeb_src/mer_uniapp/pages/index/index.vue

@@ -172,9 +172,23 @@
 			//新人礼的展示判断
 			let newGift = self.$Cache.get('newGift') ? JSON.parse(self.$Cache.get('newGift')) : [];
 			self.couponModal = newGift.length ? true : false;
+
+			// 恢复滚动条位置（使用缓存方案）
+			let scrollTop = uni.getStorageSync('index_scroll_top');
+			if (scrollTop > 0) {
+				this.$nextTick(() => {
+					setTimeout(() => {
+						uni.pageScrollTo({
+							scrollTop: parseInt(scrollTop),
+							duration: 0
+						});
+					}, 200); // 给一定的延迟等待列表渲染
+				});
+			}
 		},
 		// 滚动监听
 		onPageScroll(e) {
+			uni.setStorageSync('index_scroll_top', e.scrollTop);
 			// 传入scrollTop值并触发所有easy-loadimage组件下的滚动监听事件
 			uni.$emit('scroll');
 			if (e.scrollTop > this.domOffsetTop) {

crmeb_src/mer_uniapp/pages/users/user_payment/index.vue

@@ -385,13 +385,13 @@
 						uni.requestPayment({
 							provider: 'wxpay',
 							orderInfo: {
-                "appid": jsConfig.appId, // 微信开放平台 - 应用 - AppId，注意和微信小程序、公众号 AppId 可能不一致
-                "noncestr": jsConfig.nonceStr, // 随机字符串
-                "package": "Sign=WXPay", // 固定值
-                "partnerid": jsConfig.partnerid, // 微信支付商户号
-                "prepayid": jsConfig.prepayid, // 统一下单订单号
-                "timestamp": Number(jsConfig.timeStamp), // 时间戳（单位：秒）
-                "sign": jsConfig.paySign // 签名
+								"appid": jsConfig.appId, // 微信开放平台 - 应用 - AppId，注意和微信小程序、公众号 AppId 可能不一致
+								"noncestr": jsConfig.nonceStr, // 随机字符串
+								"package": "Sign=WXPay", // 固定值
+								"partnerid": jsConfig.partnerid, // 微信支付商户号
+								"prepayid": jsConfig.prepayid, // 统一下单订单号
+								"timestamp": Number(jsConfig.timeStamp), // 时间戳（单位：秒）
+								"sign": jsConfig.paySign // 签名
 							}, //微信、支付宝订单数据 【注意微信的订单信息，键值应该全部是小写，不能采用驼峰命名】
 							success: function(res) {
 								return that.$util.Tips({
@@ -456,9 +456,9 @@
 						};
 						if (that.payChannel == "h5") {
 							uni.hideLoading();
-              setTimeout(() => {
-                location.href = jsConfig.mwebUrl;
-              }, 100)
+						  setTimeout(() => {
+							location.href = jsConfig.mwebUrl;
+						  }, 100)
 						} else {
 							that.$wechat.pay(data)
 								.finally(() => {