Merge branch 'feature/mall_product' of http://117.33.142.185:3000/zenghuapei/cyywl_server into feature/mall_product

yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/controller/admin/express/vo/ShippingTemplatesFreeRespVO.java

@@ -51,4 +51,7 @@ public class ShippingTemplatesFreeRespVO implements Serializable {
 
     @Schema(description = "分组唯一值", required = true)
     private String uniqid;
+
+    @Schema(description = "城市名称描述")
+    private String title;
 }

yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/controller/admin/express/vo/ShippingTemplatesNoDeliveryRespVO.java

@@ -39,4 +39,7 @@ public class ShippingTemplatesNoDeliveryRespVO implements Serializable {
 
     @Schema(description = "省ID, 多个逗号分割。 全国 all", required = true, example = "1,2,3,4")
     private String provinceId;
+
+    @Schema(description = "城市名称描述", required = true)
+    private String title;
 }

yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/controller/admin/express/vo/ShippingTemplatesRegionRespVO.java

@@ -58,4 +58,7 @@ public class ShippingTemplatesRegionRespVO implements Serializable {
     @Schema(description = "分组唯一值", required = true)
     private String uniqid;
 
+    @Schema(description = "城市名称描述")
+    private String title;
+
 }

yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/controller/admin/notify/WxPayNotifyController.java

@@ -46,7 +46,7 @@ public class WxPayNotifyController {
     private StoreOrderService storeOrderService;
     @Autowired
     private RechargeOrderMapper rechargeOrderMapper;
-
+    @Autowired
     private PhoneRecordService phoneRecordService;
 
 

yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/dal/dataobject/express/ShippingTemplatesFreeDO.java

@@ -69,4 +69,9 @@ public class ShippingTemplatesFreeDO implements Serializable {
      *是否无效
      */
     private Boolean status;
+
+    /**
+     * 城市名称描述
+     */
+    private String title;
 }

yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/dal/dataobject/express/ShippingTemplatesNoDeliveryDO.java

@@ -50,5 +50,10 @@ public class ShippingTemplatesNoDeliveryDO implements Serializable {
      */
     private String uniqid;
 
+    /**
+     * 城市名称描述
+     */
+    private String title;
+
 
 }

yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/dal/dataobject/express/ShippingTemplatesRegionDO.java

@@ -81,5 +81,10 @@ public class ShippingTemplatesRegionDO implements Serializable {
      */
     private Boolean status;
 
+    /**
+     * 城市名称描述
+     */
+    private String title;
+
 
 }

yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/service/category/impl/CategoryServiceImpl.java

@@ -317,7 +317,6 @@ public class CategoryServiceImpl extends ServiceImpl<CategoryMapper, Category> i
                 list.add(tree);
             }
         }
-        log.info("无限极分类 : getTree:" + JsonUtils.toJsonString(list));
         return list;
     }
 

yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/service/express/impl/ShippingTemplatesFreeServiceImpl.java

@@ -67,7 +67,7 @@ public class ShippingTemplatesFreeServiceImpl extends ServiceImpl<ShippingTempla
             for (Integer cityId: cityIdList) {
                 ShippingTemplatesFreeDO shippingTemplatesFreeDO = new ShippingTemplatesFreeDO();
                 shippingTemplatesFreeDO.setCityId(cityId);
-//                shippingTemplatesFreeDO.setTitle(shippingTemplatesFreeRespVO.getTitle());
+                shippingTemplatesFreeDO.setTitle(shippingTemplatesFreeRespVO.getTitle());
                 shippingTemplatesFreeDO.setUniqid(uniqueKey);
                 shippingTemplatesFreeDO.setTempId(tempId);
                 shippingTemplatesFreeDO.setType(type);

yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/service/express/impl/ShippingTemplatesNoDeliveryServiceImpl.java

@@ -50,6 +50,7 @@ public class ShippingTemplatesNoDeliveryServiceImpl extends ServiceImpl<Shipping
         for (Integer cityId: cityIdList) {
             ShippingTemplatesNoDeliveryDO shippingTemplatesNoDeliveryDO = new ShippingTemplatesNoDeliveryDO();
             shippingTemplatesNoDeliveryDO.setCityId(cityId);
+            shippingTemplatesNoDeliveryDO.setTitle(shippingTemplatesNoDeliveryRespVOS.getTitle());
             shippingTemplatesNoDeliveryDO.setUniqid(uniqueKey);
             shippingTemplatesNoDeliveryDO.setTempId(tempId);
             shippingTemplatesNoDeliveryDOS.add(shippingTemplatesNoDeliveryDO);

yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/service/express/impl/ShippingTemplatesRegionServiceImpl.java

@@ -79,7 +79,7 @@ public class ShippingTemplatesRegionServiceImpl extends ServiceImpl<ShippingTemp
                 ShippingTemplatesRegionDO shippingTemplatesRegionDO = new ShippingTemplatesRegionDO();
                 shippingTemplatesRegionDO.setCityId(cityId);
                 shippingTemplatesRegionDO.setUniqid(uniqueKey);
-//                shippingTemplatesRegionDO.setTitle(shippingTemplatesRegionRespVO.getTitle());
+                shippingTemplatesRegionDO.setTitle(shippingTemplatesRegionRespVO.getTitle());
                 shippingTemplatesRegionDO.setRenewal(shippingTemplatesRegionRespVO.getRenewal());
                 shippingTemplatesRegionDO.setRenewalPrice(shippingTemplatesRegionRespVO.getRenewalPrice());
                 shippingTemplatesRegionDO.setFirst(shippingTemplatesRegionRespVO.getFirst());

yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/service/order/impl/OrderServiceImpl.java

@@ -325,13 +325,13 @@ public class OrderServiceImpl implements OrderService {
     @Override
     public OrderDataResponse orderData(String dateLimit, Integer type, String payType) {
         OrderDataResponse response = new OrderDataResponse();
-        if (type.equals(2)) {
+        if (type!=null && type==2) {
             type = null;
         }
         // 已完成订单数量
         response.setCompleteCount(getCount(dateLimit, Constants.ORDER_STATUS_COMPLETE, type));
         // 待核销订单数量
-        response.setEvaluatedCount(getCount(dateLimit, Constants.ORDER_STATUS_STR_TOBE_WRITTEN_OFF, type));
+//        response.setEvaluatedCount(getCount(dateLimit, Constants.ORDER_STATUS_STR_TOBE_WRITTEN_OFF, type));
         // 支付订单总数
         response.setOrderCount(getCount(dateLimit, Constants.ORDER_STATUS_ALL, type));
         // 待收货订单数量

yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/service/order/impl/StoreOrderServiceImpl.java

@@ -1275,7 +1275,7 @@ public class StoreOrderServiceImpl extends ServiceImpl<StoreOrderMapper, StoreOr
             phoneRecordAdd.setMoney(info.getPrice());
             phoneRecordAdd.setOrderNo(orderDO.getOrderId());
             phoneRecordAdd.setOrderTime(LocalDateTimeUtil.formatNormal(orderDO.getPayTime().toLocalDate()));
-            phoneRecordAdd.setGear(rechargeGearDO.getRefundAmount().toString());
+            phoneRecordAdd.setGear(rechargeGearDO.getRefundAmount().intValue()+"");
             phoneRecordAdds.add(phoneRecordAdd);
             recordDOS.add(phoneRecordDO);
         });

yudao-module-mall/yudao-module-shop-biz/src/main/resources/mapper/express/ShippingTemplatesFreeMapper.xml

@@ -3,6 +3,6 @@
 <mapper namespace="cn.iocoder.yudao.module.shop.dal.mysql.express.ShippingTemplatesFreeMapper">
 
     <select id="getListGroup" resultType="cn.iocoder.yudao.module.shop.controller.admin.express.vo.ShippingTemplatesFreeRespVO" parameterType="integer">
-        SELECT group_concat(`city_id`) AS city_id, province_id, `number`, price, uniqid FROM eb_shipping_templates_free where temp_id = #{tempId, jdbcType=INTEGER} GROUP BY `uniqid`,id ORDER BY id ASC
+        SELECT group_concat(`city_id`) AS city_id, province_id, title, `number`, price, uniqid FROM eb_shipping_templates_free where temp_id = #{tempId, jdbcType=INTEGER} GROUP BY `uniqid`,id ORDER BY id ASC
     </select>
 </mapper>

yudao-module-mall/yudao-module-shop-biz/src/main/resources/mapper/express/ShippingTemplatesNoDeliveryMapper.xml

@@ -3,6 +3,6 @@
 <mapper namespace="cn.iocoder.yudao.module.shop.dal.mysql.express.ShippingTemplatesNoDeliveryMapper">
 
     <select id="getList" resultType="cn.iocoder.yudao.module.shop.controller.admin.express.vo.ShippingTemplatesNoDeliveryRespVO" parameterType="integer">
-        SELECT group_concat(`city_id`) AS city_id, province_id, uniqid FROM eb_shipping_templates_no_delivery WHERE temp_id = #{tempId, jdbcType=INTEGER} GROUP BY `uniqid`,id ORDER BY id ASC
+        SELECT group_concat(`city_id`) AS city_id, province_id, title, uniqid FROM eb_shipping_templates_no_delivery WHERE temp_id = #{tempId, jdbcType=INTEGER} GROUP BY `uniqid`,id ORDER BY id ASC
     </select>
 </mapper>

yudao-module-mall/yudao-module-shop-biz/src/main/resources/mapper/express/ShippingTemplatesRegionMapper.xml

@@ -3,6 +3,6 @@
 <mapper namespace="cn.iocoder.yudao.module.shop.dal.mysql.express.ShippingTemplatesRegionMapper">
 
     <select id="getListGroup" resultType="cn.iocoder.yudao.module.shop.controller.admin.express.vo.ShippingTemplatesRegionRespVO" parameterType="integer">
-        SELECT group_concat(`city_id`) AS city_id, province_id, `first`, first_price, `renewal`, renewal_price, uniqid FROM eb_shipping_templates_region where temp_id = #{tempId, jdbcType=INTEGER} GROUP BY `uniqid`,id ORDER BY id ASC
+        SELECT group_concat(`city_id`) AS city_id, province_id, `first`, first_price, title, `renewal`, renewal_price, uniqid FROM eb_shipping_templates_region where temp_id = #{tempId, jdbcType=INTEGER} GROUP BY `uniqid`,id ORDER BY id ASC
     </select>
 </mapper>

yudao-server/src/main/resources/application-local.yaml

@@ -255,5 +255,5 @@ justauth:
     timeout: 24h # 超时时长，目前只对 Redis 缓存生效，默认 3 分钟
 
 phone:
-  query-url: http://192.168.1.189:4006/cyywl-phone-query-api/
+  query-url: http://phone.cyywl.top/cyywl-phone-query-api/
   token: eyIwLnR5cCI6IkpXVCIsImFsZyI6IkhTNTEyIn0

yudao-ui-admin/src/views/deliverGoods/freightSet/creatTemplates.vue

@@ -374,7 +374,7 @@ export default {
     shippingRegion() {
       logistics.shippingRegion({ tempId: this.tempId }).then(res => {
         res.data.forEach((item, index) => {
-          item.title = JSON.parse(item.title)
+          // item.title = JSON.parse(item.title)
           item.city_ids = item.title
         })
         this.ruleForm.region = res.data

yudao-ui-app/pages.json

@@ -589,15 +589,15 @@
       {
 				"pagePath": "pages/index/index",
 				"iconPath": "static/images/tabbar/nav_icon_shop.png",
-				"selectedIconPath": "static/images/1-002.png",
+				"selectedIconPath": "static/images/tabbar/nav_icon_shop_active.png",
 				"text": "商城"
 			},
-			// {
+      {
-			// 	"pagePath": "pages/goods_cate/goods_cate",
+      	"pagePath": "pages/goods_cate/goods_cate",
-			// 	"iconPath": "static/images/tabbar/nav_icon_sort.png",
+      	"iconPath": "static/images/tabbar/nav_icon_sort.png",
-			// 	"selectedIconPath": "static/images/2-002.png",
+      	"selectedIconPath": "static/images/tabbar/nav_icon_sort_active.png",
-			// 	"text": "分类"
+      	"text": "分类"
-			// },
+      },
       {
       	"pagePath": "pages/member_application/index",
       	"iconPath": "static/images/tabbar/nav_icon_member.png",

yudao-ui-app/pages/member_application/index.vue

@@ -58,16 +58,6 @@
     },
     data() {
       return {
-        			// list: [
-        			// 	{
-        			// 		name:'购买记录',
-        			// 		fontSize:'28'
-        			// 	},
-           //      {
-           //      	name:'为他人充值',
-           //      	fontSize:'28'
-           //      },
-        			// ],
         memberData: [],
         payInfo: {
           userPhone: '',
@@ -106,7 +96,7 @@
         const res = await memberGradeInfo()
              if(res.data.some((item) => !!parseInt(item.isExist))){
                uni.setTabBarItem({
-                 index: 0,
+                 index: 2,
                  pagePath: '/pages/member_equity/index'
                })
                uni.switchTab({
@@ -114,7 +104,7 @@
                })
              }else{
                uni.setTabBarItem({
-                 index: 0,
+                index: 2,
                  pagePath: '/pages/member_application/index'
                })
              }

yudao-ui-app/pages/member_back/index.vue

@@ -0,0 +1,419 @@
+<template>
+  <view class="box">
+    <view class="box-member">
+      <view class="member-left">
+        <text class="left-title">{{memberDetail.grade}}</text>
+        <view class="left-info">
+          <text>{{userInfo.mobile}}</text>
+          <text>会员积分：{{memberDetail.integral}}</text>
+        </view>
+        <text>再升1级即可获得【XX】等6项权益</text>
+      <view class="left-button">
+          <view class="left-shopping" @click="handleRouter('购买记录')">
+            <text>购买记录</text>
+            <image src="../../static/images/shopping-right.png" ></image>
+          </view>
+           <view class="left-others" @click="handleRouter('为他人充值')">
+            为他人充值
+            <image src="../../static/images/others-right.png" ></image>
+          </view>
+        </view>
+      </view>
+     <view class="member-right">
+        <image src='../../static/images/vipStar.png'></image>
+        <text>会员等级{{vipData.findIndex((item) => item == memberDetail.grade) +1}}级</text>
+        <button @click="handleRenew">立即续费</button>
+      </view>
+    </view>
+    <view class="box-equity">
+      <view class="equity-text">
+        <view >
+          <image src='../../static/images/memberLogo.png'></image>
+          <text class="equity-member">我的会员权益</text>
+        </view>
+        <text class="equity-look">查看权益></text>
+      </view>
+      <view class="equity-item" v-for="(item,index) in equityData" :key="index">
+        <view class="equity-grade">
+          <image :src='list[list.findIndex((i) => item.gear == i.name)].img'></image>
+          <text>办理日期：{{item.startTime}}</text>
+        </view>
+        <view class="equity-money">
+          <view class="money-box money-completed">
+            <text>已返回金额（元）</text>
+            <view>
+              <text class="money-text">{{item.totalMoney}}</text>
+              <text class="money-detailed" @click="handleDetailed(item.reportId)">查看明细></text>
+            </view>
+          </view>
+          <view class="money-box money-treat">
+            <text>带返还金额 (元) </text>
+            <text class="money-text">{{list[list.findIndex((i) => item.gear == i.name)].name-item.totalMoney}}</text>
+          </view>
+          <view class="money-box money-term">
+            <text>带返还期额</text>
+            <text class="money-text">{{item.frequency}}x12</text>
+          </view>
+          <view class="money-box money-time">
+            <text>返费结束时间</text>
+            <text class="money-text">{{item.endTime}}</text>
+         </view>
+               </view>
+             </view>
+           </view>
+           <u-navbar leftIcon="" title="会员申请"></u-navbar>
+         </view>
+</template>
+
+<script>
+  import {
+    memberHeadInfo,
+    memberGradeInfo,
+    query
+  } from '@/api/member.js';
+  import {
+    mapGetters
+  } from 'vuex'
+  export default {
+    name: "member_application",
+    data() {
+      return {
+        			list: [
+        				{
+        					img:'../../static/images/member240.png',
+        					name:'360'
+        				},
+                {
+                	img:'../../static/images/member400.png',
+                	name:'600'
+                },
+                {
+                	img:'../../static/images/member960.png',
+                	name:'900'
+                },
+        			],
+              vipData:['普通会员','中级会员','高级会员'],
+        			show: false,
+              memberDetail:{},
+              equityData:[]
+      };
+    },
+    computed: mapGetters(['userInfo']),
+   async onLoad() {
+     const resful = await memberGradeInfo()
+          if(resful.data.some((item) => !!parseInt(item.isExist))){
+            uni.setTabBarItem({
+              index: 0,
+              pagePath: '/pages/member_equity/index'
+            })
+          }else{
+            uni.setTabBarItem({
+              index: 0,
+              pagePath: '/pages/member_application/index'
+            })
+            uni.switchTab({
+              url:'/pages/member_application/index'
+            })
+          }
+     const res = await memberHeadInfo()
+     this.memberDetail = res.data
+     const equity = await query(this.userInfo.mobile)
+      this.equityData = equity.data
+    },
+    methods: {
+      handleDetailed(reportId){
+        uni.navigateTo({
+          url:`/pages/member_detail/index?reportId=${reportId}`,
+        })
+      },
+      handleRenew(){
+        uni.navigateTo({
+            url:'/pages/member_renew/index'
+          })
+      },
+      handleRouter(value){
+        switch (value){
+          case "购买记录":
+          uni.navigateTo({
+            url:'/pages/member_record/index'
+          })
+          break;
+          case "为他人充值":
+          uni.navigateTo({
+            url:'/pages/member_others/index'
+          })
+          break;
+          default:
+          break;
+        }
+      },
+    }
+  };
+</script>
+
+<style lang="scss" scoped>
+  .box {
+    margin-bottom: 30%;
+    margin-top: 10%;
+    background: #fff;
+    height: 100vh;
+    background: url(../../static/images/memberBg.png);
+    background-size: cover;
+    background-repeat: no-repeat;
+    background-attachment: fixed;
+
+      .u-nav-slot{
+      ::v-deep .u-popup__content{
+        padding-bottom: 20% !important;
+
+      }
+    }
+
+
+    .box-member {
+      padding: 36rpx 40rpx;
+      border-radius: 20rpx;
+      width: 100%;
+      // padding: 20rpx 20rpx 30rpx 20rpx;
+      display: flex;
+      justify-content: space-between;
+      line-height: 50rpx;
+      .member-left {
+        display: flex;
+        flex-direction: column;
+        justify-content: space-between;
+        width: 69%;
+        font-size: 28rpx;
+        font-family: PingFang SC;
+        font-weight: 400;
+        color: #000000;
+
+        .left-title {
+          font-size: 35rpx;
+          font-family: PingFang SC;
+          font-weight: 600;
+          color: #000000;
+        }
+
+        .left-info {
+          display: flex;
+          justify-content: space-between;
+        }
+        .left-button{
+          display: flex;
+          justify-content: space-between;
+          margin-top: 10rpx;
+          image{
+            width: 24rpx;
+            height: 24rpx;
+            margin-left: 13rpx;
+          }
+          .left-shopping{
+            display: flex;
+            align-items: center;
+            justify-content: center;
+              width: 204rpx;
+              height: 61rpx;
+              background: #F8EFF0;
+              border: 1px solid #F783B0;
+              border-radius: 30rpx;
+              font-size: 28rpx;
+              font-family: PingFang SC;
+              font-weight: 400;
+              color: #000000;
+          }
+          .left-others{
+            background-image: url("../../static/images/others-button.png");
+            background-size: 204rpx 61rpx;
+            display: flex;
+            align-items: center;
+            justify-content: center;
+              width: 204rpx;
+              height: 61rpx;
+             font-size: 28rpx;
+             font-family: PingFang SC;
+             font-weight: 400;
+             color: #FFFFFF;
+          }
+        }
+      }
+
+      .member-right {
+        display: flex;
+        flex-direction: column;
+        justify-content: space-between;
+        align-items: center;
+        width: 22%;
+        font-size: 22rpx;
+        font-family: PingFang SC;
+        font-weight: 400;
+        color: #000000;
+
+        image {
+          width: 100rpx;
+          height: 100rpx;
+          border-radius: 50%;
+          margin-bottom: 10rpx;
+        }
+
+        button {
+          margin-top: 10rpx;
+          padding: 7rpx 16rpx;
+          background: #F22E60;
+          border-image: linear-gradient(0deg, #A8052E, #FFFFFF) 10 10;
+          border-radius: 18rpx;
+          font-size: 22rpx;
+          font-family: PingFang SC;
+          font-weight: 400;
+          color: #FFFFFF;
+        }
+      }
+    }
+
+    .box-equity {
+      // border-radius: 20rpx;
+      width: 100%;
+      padding: 0 40rpx;
+      background: url(../../static/images/memberEquity.png);
+      background-size: 100%;
+      background-repeat: no-repeat;
+      display: flex;
+      flex-direction: column;
+      position: relative;
+
+      .equity-text {
+        margin: 5% 0;
+        display: flex;
+        align-items: center;
+        height: 10%;
+        view{
+          display: flex;
+          align-items: center;
+          justify-content: center;
+          width: 44%;
+          image{
+            width: 26rpx;
+            height: 26rpx;
+          }
+        }
+        .equity-member {
+          margin: 0 10%;
+          font-size: 30rpx;
+          font-family: PingFang SC;
+          font-weight: 400;
+          color: #FFFFFF;
+        }
+
+        .equity-look {
+          font-size: 28rpx;
+          font-family: PingFang SC;
+          font-weight: 400;
+          color: #FF4922;
+        }
+      }
+
+      .equity-item {
+        background: #fff;
+        display: flex;
+        flex-direction: column;
+        justify-content: space-between;
+        border-radius: 20rpx;
+        margin: 0 20rpx 20rpx 20rpx;
+
+        .equity-grade {
+          border-radius: 10rpx 10rpx;
+          padding: 20rpx;
+          display: flex;
+          justify-content: space-between;
+          font-size: 24rpx;
+          font-family: PingFang SC;
+          font-weight: 400;
+          color: #000000;
+          image{
+            width: 295rpx;
+            height: 35rpx;
+          }
+        }
+
+        .equity-money {
+          display: flex;
+          justify-content: space-around;
+          flex-wrap: wrap;
+
+          .money-box {
+            width: 46%;
+            padding: 24rpx 25rpx;
+            border-radius: 10px;
+            display: flex;
+            flex-direction: column;
+            justify-content: space-between;
+            font-size: 28rpx;
+            font-family: PingFang SC;
+            font-weight: 400;
+            color: #000000;
+            margin-bottom: 18rpx;
+
+            .money-text {
+              font-size: 30rpx;
+              font-family: PingFang SC;
+              font-weight: 400;
+
+            }
+          }
+
+          .money-completed {
+            background: #FFF2F2;
+            border: 1px solid #F22E60;
+
+            .money-text {
+              color: #F91F57;
+            }
+
+            view {
+              margin-top: 26rpx;
+              display: flex;
+              justify-content: space-between;
+              align-items: center;
+              font-size: 24rpx;
+              font-family: PingFang SC;
+              font-weight: 400;
+              color: #000000;
+            }
+          }
+
+          .money-treat {
+            background: #FFFDF1;
+            border: 1px solid #FF962F;
+
+            .money-text {
+              margin-top: 26rpx;
+              color: #EBAF00;
+            }
+          }
+
+          .money-term {
+            background: #F8FFF8;
+            border: 1px solid #38A74F;
+
+            .money-text {
+              margin-top: 26rpx;
+              color: #2C9E2C;
+            }
+          }
+
+          .money-time {
+            background: #F0FDFC;
+            border: 1px solid #5CA4E8;
+
+            .money-text {
+              margin-top: 26rpx;
+              color: #2D7AC9;
+            }
+          }
+        }
+      }
+    }
+
+
+  }
+</style>

yudao-ui-app/pages/member_equity/index.vue

@@ -103,12 +103,12 @@
      const resful = await memberGradeInfo()
           if(resful.data.some((item) => !!parseInt(item.isExist))){
             uni.setTabBarItem({
-              index: 0,
+              index: 2,
               pagePath: '/pages/member_equity/index'
             })
           }else{
             uni.setTabBarItem({
-              index: 0,
+              index: 2,
               pagePath: '/pages/member_application/index'
             })
             uni.switchTab({
@@ -117,8 +117,7 @@
           }
      const res = await memberHeadInfo()
      this.memberDetail = res.data
-     // this.userInfo.mobile
+     const equity = await query(this.userInfo.mobile)
-     const equity = await query(13668261228)
       this.equityData = equity.data
     },
     methods: {