feat：我也不知道改了啥，太多了

common/js/api.js

@@ -3,6 +3,27 @@ import request from '../js/request.js';
 
 export default {
 
+    //查询未读的亲情卡消费记录
+    getRecommendActivity(data) {
+        return request({
+            url: '/business/wechat/activity/getRecommendActivity',
+            method: 'GET',
+            data: data
+        })
+    },
+
+
+    //查询未读的亲情卡消费记录
+    notReadRecordList(data) {
+        return request({
+            url: '/member/loveCard/notReadRecordList',
+            method: 'GET',
+            data: data
+        })
+    },
+
+
+
     //我的活动详情
     myActivityDetail(data) {
         return request({

common/js/env.js

@@ -8,6 +8,7 @@ let trialBaseUrl = `https://jje.xinyuekj.com.cn/test-api`
 
 /** 开发环境*/
 // let developBaseUrl = `http://65i1sxopd9qp.ngrok.xiaomiqiu123.top`
+// let developBaseUrl = `https://jje.xinyuekj.com.cn/prod-api`
 let developBaseUrl = `https://jje.xinyuekj.com.cn/test-api`
 
 

myPages/familyCard/index.vue

@@ -1,213 +1,238 @@
 <template>
-    <view class="page">
-        <view class="scroll-y">
+  <view class="page">
+    <view class="scroll-y">
 
-            <view class="title">
-                <text>我收到的亲情卡</text>
-            </view>
+      <view class="title">
+        <text>我收到的亲情卡</text>
+      </view>
 
-            <view class="loveCardNull" v-if="gotList.length === 0">
-                <view class="flex-row justify-center">
-                    <image src="/static/me/zhanwu.png" class="nullIcon"></image>
-                </view>
-                <view class="flex-row justify-center nullMsg">
-                    <text>暂无收到的亲情卡</text>
-                </view>
-            </view>
+      <view class="loveCardNull" v-if="gotList.length === 0">
+        <view class="flex-row justify-center">
+          <image src="/static/me/zhanwu.png" class="nullIcon"></image>
+        </view>
+        <view class="flex-row justify-center nullMsg">
+          <text>暂无收到的亲情卡</text>
+        </view>
+      </view>
 
-            <view v-else>
-                <view class="loveCard" v-for="(item,index) in gotList" :key="index" @click="jumpToDetail(item,2)">
-                    <image src="/static/familyCard/shoudaoLove.png" class="imgBack"></image>
-                    <view class="loveCardMsg">
-                        <view class="flex-row">
-                            <view>
-                                <image :src="item.url || '/static/me/ud4.png'" class="avatar"></image>
-                            </view>
-                            <view class="flex-col">
-                                <text class="name">{{item.presentUserName}}({{item.relation}})</text>
-                                <text class="vipNo">{{item.presentUserNo}}</text>
-                            </view>
-                        </view>
-                        <view class="flex-row justify-between">
-<!--                            <view class="flex-col priceView">-->
-<!--                                <text class="priceTitle">每月上限</text>-->
-<!--                                <view>-->
-<!--                                    &lt;!&ndash;<text class="priceSymbol">￥</text>&ndash;&gt;-->
-<!--                                    <text class="price">{{item.amountCap}}</text>-->
-<!--                                </view>-->
-<!--                            </view>-->
-<!--                            <view class="flex-col priceView borderRight1">-->
-<!--                                <text class="priceTitle">剩余额度</text>-->
-<!--                                <view>-->
-<!--                                    &lt;!&ndash;<text class="priceSymbol">￥</text>&ndash;&gt;-->
-<!--                                    <text class="price">{{item.totalBalance || 0}}</text>-->
-<!--                                </view>-->
-<!--                            </view>-->
-<!--                            <view class="flex-col priceView borderRight1">-->
-<!--                                <text class="priceTitle">已用额度</text>-->
-<!--                                <view>-->
-<!--                                    &lt;!&ndash;<text class="priceSymbol">￥</text>&ndash;&gt;-->
-<!--                                    <text class="price">{{item.amount || '0'}}</text>-->
-<!--                                </view>-->
-<!--                            </view>-->
-                        </view>
-                    </view>
-                </view>
+      <view v-else>
+        <view class="loveCard" v-for="(item,index) in gotList" :key="index" @click="jumpToDetail(item,2)">
+          <image src="/static/familyCard/shoudaoLove.png" class="imgBack"></image>
+          <view class="loveCardMsg">
+            <view class="flex-row">
+              <view>
+                <image :src="item.url || '/static/me/ud4.png'" class="avatar"></image>
+              </view>
+              <view class="flex-col">
+                <text class="name">{{ item.presentUserName }}({{ item.relation }})</text>
+                <text class="vipNo">{{ item.presentUserNo }}</text>
+              </view>
             </view>
-
-            <view class="title">
-                <text>亲属列表</text>
+            <view class="flex-row justify-between">
+              <!--                            <view class="flex-col priceView">-->
+              <!--                                <text class="priceTitle">每月上限</text>-->
+              <!--                                <view>-->
+              <!--                                    &lt;!&ndash;<text class="priceSymbol">￥</text>&ndash;&gt;-->
+              <!--                                    <text class="price">{{item.amountCap}}</text>-->
+              <!--                                </view>-->
+              <!--                            </view>-->
+              <!--                            <view class="flex-col priceView borderRight1">-->
+              <!--                                <text class="priceTitle">剩余额度</text>-->
+              <!--                                <view>-->
+              <!--                                    &lt;!&ndash;<text class="priceSymbol">￥</text>&ndash;&gt;-->
+              <!--                                    <text class="price">{{item.totalBalance || 0}}</text>-->
+              <!--                                </view>-->
+              <!--                            </view>-->
+              <!--                            <view class="flex-col priceView borderRight1">-->
+              <!--                                <text class="priceTitle">已用额度</text>-->
+              <!--                                <view>-->
+              <!--                                    &lt;!&ndash;<text class="priceSymbol">￥</text>&ndash;&gt;-->
+              <!--                                    <text class="price">{{item.amount || '0'}}</text>-->
+              <!--                                </view>-->
+              <!--                            </view>-->
             </view>
+          </view>
+        </view>
+      </view>
+
+      <view class="title">
+        <text>亲属列表</text>
+      </view>
+
+      <view class="loveCardNull" v-if="giveList.length === 0">
+        <view class="flex-row justify-center">
+          <image src="/static/me/zhanwu.png" class="nullIcon"></image>
+        </view>
+        <view class="flex-row justify-center nullMsg">
+          <text>暂无亲属列表</text>
+        </view>
+      </view>
 
-            <view class="loveCardNull" v-if="giveList.length === 0">
-                <view class="flex-row justify-center">
-                    <image src="/static/me/zhanwu.png" class="nullIcon"></image>
+      <view v-else>
+        <view class="loveCard" v-for="(item, index) in giveList" :key="index" @click="jumpToDetail(item,1)">
+          <image src="/static/familyCard/zengsLove.png" class="imgBack"></image>
+          <view class="loveCardMsg">
+            <view class="flex-row justify-between">
+              <view class="flex-row">
+                <view>
+                  <image :src="item.url || '/static/me/ud4.png'" class="avatar"></image>
                 </view>
-                <view class="flex-row justify-center nullMsg">
-                    <text>暂无亲属列表</text>
+                <view class="flex-col">
+                  <text class="name">{{ item.userName }}({{ item.relation }})</text>
+                  <text class="vipNo">{{ item.userNo }}</text>
                 </view>
+              </view>
+
+              <view v-if="isShow(item.id)" class="flex-col justify-center" style="margin-right: 20rpx">
+                <uni-icons size="12" color="red" type="smallcircle-filled"></uni-icons>
+              </view>
             </view>
 
-            <view v-else>
-                <view class="loveCard" v-for="(item, index) in giveList" :key="index" @click="jumpToDetail(item,1)">
-                    <image src="/static/familyCard/zengsLove.png" class="imgBack"></image>
-                    <view class="loveCardMsg">
-                        <view class="flex-row">
-                            <view>
-                                <image :src="item.url || '/static/me/ud4.png'" class="avatar"></image>
-                            </view>
-                            <view class="flex-col">
-                                <text class="name">{{item.userName}}({{item.relation}})</text>
-                                <text class="vipNo">{{item.userNo}}</text>
-                            </view>
-                        </view>
-<!--                        <view class="flex-row justify-between">-->
-<!--                            <view class="flex-col priceView ">-->
-<!--                                <text class="priceTitle">每月上限</text>-->
-<!--                                <view>-->
-<!--                                    &lt;!&ndash;<text class="priceSymbol">￥</text>&ndash;&gt;-->
-<!--                                    <text class="price">{{item.amountCap}}</text>-->
-<!--                                </view>-->
-<!--                            </view>-->
-<!--                            <view class="flex-col priceView borderRight2">-->
-<!--                                <text class="priceTitle">可用额度</text>-->
-<!--                                <view>-->
-<!--                                    &lt;!&ndash;<text class="priceSymbol">￥</text>&ndash;&gt;-->
-<!--                                    <text class="price">{{item.totalBalance || 0}}</text>-->
-<!--                                </view>-->
-<!--                            </view>-->
-<!--                            <view class="flex-col priceView borderRight2">-->
-<!--                                <text class="priceTitle">已用额度</text>-->
-<!--                                <view>-->
-<!--                                    &lt;!&ndash;<text class="priceSymbol">￥</text>&ndash;&gt;-->
-<!--                                    <text class="price">{{item.amount || 0}}</text>-->
-<!--                                </view>-->
-<!--                            </view>-->
-<!--                        </view>-->
-                    </view>
-                </view>
 
-            </view>
 
+            <!--                        <view class="flex-row justify-between">-->
+            <!--                            <view class="flex-col priceView ">-->
+            <!--                                <text class="priceTitle">每月上限</text>-->
+            <!--                                <view>-->
+            <!--                                    &lt;!&ndash;<text class="priceSymbol">￥</text>&ndash;&gt;-->
+            <!--                                    <text class="price">{{item.amountCap}}</text>-->
+            <!--                                </view>-->
+            <!--                            </view>-->
+            <!--                            <view class="flex-col priceView borderRight2">-->
+            <!--                                <text class="priceTitle">可用额度</text>-->
+            <!--                                <view>-->
+            <!--                                    &lt;!&ndash;<text class="priceSymbol">￥</text>&ndash;&gt;-->
+            <!--                                    <text class="price">{{item.totalBalance || 0}}</text>-->
+            <!--                                </view>-->
+            <!--                            </view>-->
+            <!--                            <view class="flex-col priceView borderRight2">-->
+            <!--                                <text class="priceTitle">已用额度</text>-->
+            <!--                                <view>-->
+            <!--                                    &lt;!&ndash;<text class="priceSymbol">￥</text>&ndash;&gt;-->
+            <!--                                    <text class="price">{{item.amount || 0}}</text>-->
+            <!--                                </view>-->
+            <!--                            </view>-->
+            <!--                        </view>-->
+          </view>
         </view>
-        <view class="bottom">
-            <view class="flex-row justify-center agreementView">
-                <u-icon name="/static/me/o1.png" size="20" v-if="choose" @click="changeChoose"></u-icon>
-                <u-icon name="/static/me/o.png" size="20" v-else @click="changeChoose"></u-icon>
-                <text class="read">我已阅读并同意</text>
-                <text class="agreement" @click="gotoAgreement(12,'亲情卡使用说明')">使用说明</text>
-            </view>
-            <view class="zsBtn" @click="jumpToGive">赠送亲情卡</view>
-        </view>
+
+      </view>
+
     </view>
+    <view class="bottom">
+      <view class="flex-row justify-center agreementView">
+        <u-icon name="/static/me/o1.png" size="20" v-if="choose" @click="changeChoose"></u-icon>
+        <u-icon name="/static/me/o.png" size="20" v-else @click="changeChoose"></u-icon>
+        <text class="read">我已阅读并同意</text>
+        <text class="agreement" @click="gotoAgreement(12,'亲情卡使用说明')">使用说明</text>
+      </view>
+      <view class="zsBtn" @click="jumpToGive">赠送亲情卡</view>
+    </view>
+  </view>
 </template>
 
 <script>
-    export default {
-        name: "index",
-        data() {
-            return {
-
-                choose: false,
-                giveList: [],
-                gotList: []
-            }
-        },
-        onShow() {
-            this.getGiveList()
-            this.getGotList()
-        },
-        onPullDownRefresh() {
-            this.getGiveList()
-            this.getGotList()
-            uni.stopPullDownRefresh()
-        },
-        methods: {
-            changeChoose() {
-                this.choose = !this.choose
-            },
-            // 去协议页面
-            gotoAgreement(type, name) {
-                console.log(type,name)
-                uni.navigateTo({
-                    url: '/myPages/TermsOfService/index?name=' + name + '&type=' + type,
-                })
-            },
-            jumpToGive() {
-                if (!this.choose) {
-                    uni.showToast({
-                        icon: 'none',
-                        duration: 3000,
-                        title: '请勾选使用说明'
-                    });
-                } else {
-                    uni.navigateTo({
-                        url: '/myPages/familyCard/giveFamilyCard/giveFamilyCard'
-                    })
-                }
-            },
-            jumpToDetail(item,number) {
-                uni.navigateTo({
-                    url: '/myPages/familyCard/unbindFamilyCard/unbindFamilyCard?data=' + JSON.stringify(item) + '&type=' + number
-                })
-            },
-            getImgUrlByOssId(list, number) {
-                if (list) {
-                    for (let i=0;i<list.length;i++){
-                        let data = null
-                        if (number == 1) {
-                            data = list[i].userPhoto
-                        } else {
-                            data = list[i].presentUserPhoto
-                        }
-                        if (data) {
-                            this.$api.getImage(data).then(res => {
-                                list[i].url = res.data.data[0].url.replace(/^http:/, "https:")
-                                this.$set(list,i,list[i])
-                            });
-                        }
-                    }
-                }
-            },
-            //获取我赠送的亲情卡列表
-            getGiveList() {
-                this.$api.getMyPresentList().then((res) => {
-                    this.giveList = res.data.data
-                    this.getImgUrlByOssId(this.giveList, 1)
-                })
-
-            },
-            //查询我收到的情亲卡列表
-            getGotList() {
-                this.$api.getMyReceiveList().then((res) => {
-                    this.gotList = res.data.data
-                    this.getImgUrlByOssId(this.gotList, 2)
-                })
-            }
+export default {
+  name: "index",
+  data() {
+    return {
+      readRecordList: [],
+      choose: false,
+      giveList: [],
+      gotList: []
+    }
+  },
+  onShow() {
+    this.getGiveList()
+    this.getGotList()
+    this.notReadRecordList()
+  },
+  onPullDownRefresh() {
+    this.getGiveList()
+    this.getGotList()
+    uni.stopPullDownRefresh()
+  },
+  methods: {
+
+    isShow(id){
+      if (this.readRecordList.includes(id)){
+        return true
+      }else {
+        return false
+      }
+    },
+
+    notReadRecordList() {
+      this.$api.notReadRecordList().then(res => {
+        this.readRecordList = res.data.data
+      })
+    },
+
+    changeChoose() {
+      this.choose = !this.choose
+    },
+    // 去协议页面
+    gotoAgreement(type, name) {
+      console.log(type, name)
+      uni.navigateTo({
+        url: '/myPages/TermsOfService/index?name=' + name + '&type=' + type,
+      })
+    },
+    jumpToGive() {
+      if (!this.choose) {
+        uni.showToast({
+          icon: 'none',
+          duration: 3000,
+          title: '请勾选使用说明'
+        });
+      } else {
+        uni.navigateTo({
+          url: '/myPages/familyCard/giveFamilyCard/giveFamilyCard'
+        })
+      }
+    },
+    jumpToDetail(item, number) {
+      uni.navigateTo({
+        url: '/myPages/familyCard/unbindFamilyCard/unbindFamilyCard?data=' + JSON.stringify(item) + '&type=' + number
+      })
+    },
+    getImgUrlByOssId(list, number) {
+      if (list) {
+        for (let i = 0; i < list.length; i++) {
+          let data = null
+          if (number == 1) {
+            data = list[i].userPhoto
+          } else {
+            data = list[i].presentUserPhoto
+          }
+          if (data) {
+            this.$api.getImage(data).then(res => {
+              list[i].url = res.data.data[0].url.replace(/^http:/, "https:")
+              this.$set(list, i, list[i])
+            });
+          }
         }
+      }
+    },
+    //获取我赠送的亲情卡列表
+    getGiveList() {
+      this.$api.getMyPresentList().then((res) => {
+        this.giveList = res.data.data
+        this.getImgUrlByOssId(this.giveList, 1)
+      })
+
+    },
+    //查询我收到的情亲卡列表
+    getGotList() {
+      this.$api.getMyReceiveList().then((res) => {
+        this.gotList = res.data.data
+        this.getImgUrlByOssId(this.gotList, 2)
+      })
     }
+  }
+}
 </script>
 
 <style scoped lang="scss">
-    @import "../familyCard/index.scss";
+@import "../familyCard/index.scss";
 </style>

myPages/myActivityDetail/index.rpx.scss

@@ -1,4 +1,5 @@
 .page{
+  width: 100%;
   height: 100vh;
 }
 .content{

myPages/myActivityDetail/myActivityDetail.vue

@@ -1,15 +1,28 @@
 <template>
-  <view class="flex-col page">
+  <view class="page">
 
     <view class="flex-col content">
       <view class="out1">
         <view class="flex-col top">
-          <view class="flex-row title">
-            <text>{{ activity.title }}</text>
-          </view>
-          <view class="flex-row price">
-            <text>￥{{ activity.payAmount }}</text>
+
+          <view class="flex-row justify-between" style="width: 686rpx;">
+            <view>
+              <view class="flex-row title">
+                <text>{{ activity.title }}</text>
+              </view>
+              <view class="flex-row price">
+                <text>￥{{ activity.payAmount }}</text>
+              </view>
+            </view>
+            <view v-if="activity.canShare" class="flex-col">
+              <button open-type="share" type="primary" plain="true" size="mini" class="pic_r3">
+                <text class="tit">分享活动</text>
+                <uni-icons color="#18bc37" type="redo-filled" size="14"></uni-icons>
+              </button>
+            </view>
+
           </view>
+
           <view class="flex-row justify-start">
             <view class="activityKey ">
               <text>活动时间：</text>
@@ -38,12 +51,7 @@
 
           </view>
         </view>
-        <view v-if="activity.canShare" class="flex-col top">
-          <button open-type="share" type="primary" plain="true" size="mini" class="pic_r3">
-            <text class="tit">分享活动</text>
-            <uni-icons color="#18bc37" type="redo-filled" size="14"></uni-icons>
-          </button>
-        </view>
+
       </view>
 
       <view class="out2" v-if="activity.couponList">

myPages/recharge/index.vue

@@ -50,21 +50,40 @@
 					</view>
 				</view>
 
-				<view class="skill-sequence-panel-content-wrapper">
-					<!--左边虚化-->
-					<!-- <view class="hide-content-box hide-content-box-left"></view> -->
-					<!--右边虚化-->
-					<!-- <view class="hide-content-box hide-content-box-right"></view> -->
-					<scroll-view scroll-x="true" class="kite-classify-scroll">
-						<view @click="selectActiveRecharge(item,index)" class="kite-classify-cell" :class="{kiteBackImg:currentTab === index}" v-for="(item, index) in rechargeList" :key="index">
-								<view class="money">
-									<text class="v">{{item.reachPrice}}</text>
-								</view>
+        <view class="skill-sequence-panel-content-wrapper">
+
+          <view class="itemTitle">
+            <text>活动项目</text>
+          </view>
 
-								<view class="desc">
-									<text>{{item.name}} </text>
-								</view>
+          <scroll-view scroll-x="true" class="kite-classify-scroll">
+            <view class="kite-classify-cell" style="background-image: url('/static/recharge/dianka1.png')"  v-for="(item, index) in activityList" :key="index" @click="goDetail(item)">
+              <view class="money">
+                <text class="v">{{item.salePrice}}</text>
+              </view>
 
+              <view class="desc">
+                <text>{{item.title}} </text>
+              </view>
+            </view>
+          </scroll-view>
+        </view>
+
+				<view class="skill-sequence-panel-content-wrapper">
+          <view class="itemTitle">
+            <text>储值项目</text>
+          </view>
+					<scroll-view scroll-x="true" class="kite-classify-scroll">
+						<view @click="selectActiveRecharge(item,index)" class="kite-classify-cell1" :class="{kiteBackImg:currentTab === index}" v-for="(item, index) in rechargeList" :key="index">
+              <view class="money">
+                <text class="v">{{item.reachPrice}}</text>
+              </view>
+              <view class="desc">
+                <text>{{item.name}} </text>
+              </view>
+              <view v-if="item.remark"  @click.stop="seeDetail(item)">
+                <text class="detail">详情</text>
+              </view>
 						</view>
 					</scroll-view>
 				</view>
@@ -95,7 +114,7 @@
 
 				<!-- 使用说明 -->
 
-				<view>
+				<view class="serobReminder">
 					<rich-text v-html="aboutContent">
 					</rich-text>
 				</view>
@@ -109,6 +128,7 @@
 	export default {
 		data() {
 			return {
+        activityList:[],
 				aboutContent:'',
 				show: false,
 				currentTab: '', // 当前选中的 Tab
@@ -132,21 +152,52 @@
 		},
 		onLoad(option) {
 			this.AboutByType()
+
 		},
 		onShow() {
 			// 获取充值面额
 			this.getRechargeList();
+      // 获取活动列表
+      this.getActivityList();
 			// 用户信息
 			this.userInfo = uni.getStorageSync('userInfo');
 		},
 		methods: {
+
+      goDetail(item){
+        uni.navigateTo({
+          url:'/orderPages/activityDetail/activityDetail?id=' + item.id
+        })
+      },
+
+
+      getActivityList(){
+        this.$api.activityList({
+          pageNum: 1,
+          pageSize: 1000,
+        }).then((res) => {
+          this.activityList = res.data.rows;
+        }).catch((err) => {
+
+        })
+      },
+
 			AboutByType(type) {
 				this.$api.AboutByType({type:9}).then(res => {
 					this.aboutContent = res.data.data.aboutContent
-					console.log(res,'333333333333')
 				})
 			},
 
+      seeDetail(item){
+
+        uni.showModal({
+          title:"储值详情",
+          content: item.remark,
+          showCancel:false
+        })
+
+      },
+
 			// 获取充值面额
 			getRechargeList(){
 				this.$api.getRechargeList().then((res)=>{
@@ -368,7 +419,35 @@
 		white-space: nowrap;
 	}
 
-	.kite-classify-cell {
+  .kite-classify-cell {
+    background-image: url("/static/recharge/dianka.png");
+    background-repeat: no-repeat;
+    background-size: cover;
+    display: inline-block;
+    width: 328rpx;
+    height: 160rpx;
+    margin-right: 20rpx;
+    border-radius: 15rpx;
+    overflow: hidden;
+
+    .money{
+      margin: 34rpx 0 0 40rpx;
+      color: #333333;
+      .v{
+        font-size: 18px;
+        font-weight: bold;
+      }
+    }
+    .desc{
+      margin-top: 15rpx;
+      margin-left: 40rpx;
+      font-size: 12px;
+      color: #333333;
+      line-height: 22px;
+    }
+  }
+
+	.kite-classify-cell1 {
 		background-image: url("/static/recharge/dianka.png");
 		background-repeat: no-repeat;
 		background-size: cover;
@@ -380,7 +459,7 @@
 		overflow: hidden;
 
 			.money{
-				margin: 34rpx 0 0 40rpx;
+				margin: 20rpx 0 0 40rpx;
 				color: #333333;
 				.v{
 					font-size: 18px;
@@ -388,12 +467,18 @@
 				}
 			}
 			.desc{
-				margin-top: 15rpx;
 				margin-left: 40rpx;
 				font-size: 12px;
 				color: #333333;
 				line-height: 22px;
 			}
+    .detail {
+      color: #999999;
+      font-size: 22rpx;
+      padding: 0 6rpx;
+      border-radius: 10rpx;
+      margin-left: 38rpx;
+    }
 
 	}
 
@@ -556,4 +641,14 @@
 		height: 160px;
 		background: #FFE05C;
 	}
+  .itemTitle {
+    color: #333333;
+    font-size: 28rpx;
+    font-weight: bold;
+    margin-bottom: 20rpx;
+  }
+  .serobReminder {
+    font-size: 28rpx;
+    color: #999999;
+  }
 </style>

myPages/serviceObjectAllInfo/index.vue

@@ -68,9 +68,9 @@
 <!--              </view>-->
 <!--            </picker>-->
 
-            <picker @change="bindDateChange" mode='date'  range-key="label" >
+            <picker @change="bindDateChange" mode='date' :disabled="!this.isAuthUpdate" range-key="label" >
               <view class="flex-row justify-end picker-change-store">
-                <text>{{userInfo.birthday || '请选择出生日期' }}</text>
+                <text>{{userInfo.birthday.substring(0,10) || '请选择出生日期' }}</text>
                 <u-icon name="arrow-right" color="#666" size="16"></u-icon>
               </view>
             </picker>
@@ -691,7 +691,7 @@ export default {
 
 .picker-change-store {
   font-size: 14px;
-  color: #999;
+  //color: #999;
   line-height: 22px;
 
   display: flex;

orderPages/bookService/index.rpx.scss

@@ -33,10 +33,10 @@
   position: relative;
 }
 .serobReminder{
-  margin-top: 20rpx;
-  line-height: 40rpx;
+  margin-top: 10rpx;
   //padding-left: 32rpx;
-  color: red;
+  color: #999999;
+  font-size: 28rpx;
 }
 .serobReminder:first-child{
   margin-top: 0;
@@ -84,7 +84,7 @@
 .group2{
   background: #FFFFFF;
   padding: 0 32rpx;
-  height: 212rpx;
+  height: 260rpx;
   position: fixed;
   bottom: 0;
   z-index: 5;
@@ -138,6 +138,21 @@
   color: #999999;
   //padding: 0 24rpx;
 }
+
+.btnTitle1{
+  font-size: 24rpx;
+  font-weight: 400;
+  margin-top: 20rpx;
+  color: #333333;
+  line-height: 44rpx;
+}
+.btnRight1 {
+  color: red;
+  font-size: 24rpx;
+  font-weight: 400;
+
+}
+
 .btnTitle{
   font-size: 24rpx;
   font-weight: 400;

orderPages/bookService/index.vue

@@ -142,9 +142,18 @@
 			</view>
 		</view>
 
-		<view :style="{'height':'236rpx'}"></view>
+		<view :style="{'height':'280rpx'}"></view>
 
 		<view class="flex-col  group2 ">
+
+      <view v-if="recommendActivity" class="btnTitle1 flex-row justify-between">
+        <view>
+          <text>推荐活动：{{recommendActivity.title}}</text>
+          <text style="margin-left: 10rpx;color: #999999" >（{{recommendActivity.description}}）</text>
+        </view>
+        <text class="btnRight1" @click="goDetail(recommendActivity)">去购买</text>
+      </view>
+
 			<view class="btnTitle flex-row">
 				<u-icon v-if="selectIcon" name="checkmark-circle-fill" color="#FFE52C" size="18"
 					@click="selectChange"></u-icon>
@@ -225,6 +234,7 @@
 		},
 		data() {
 			return {
+        recommendActivity:null,
 				msgType:null,
 				configContent:'',
 				timeoutId:null,
@@ -298,7 +308,7 @@
 			},1000*60*5)
 
       this.getExpireEquityCard();
-
+      this.getRecommendActivity();
 		},
 		onShow() {
 
@@ -330,6 +340,19 @@
 		},
 		methods: {
 
+      goDetail(e){
+        uni.navigateTo({
+          url:'/orderPages/activityDetail/activityDetail?id=' + e.id
+        })
+      },
+
+
+      getRecommendActivity(){
+        this.$api.getRecommendActivity().then(res=>{
+          this.recommendActivity = res.data.data
+        })
+      },
+
       navigateTo(item){
         if(item.activityId){
           let list = item.activityId.split(',')
@@ -639,6 +662,11 @@
 					}
 
 				} else {
+          uni.showModal({
+            title:"温馨提示",
+            content:"当前默认门店为" + this.storeInfo.storeName + "是否需要更换",
+            showCancel:false
+          })
 					this.$api.getServicePersonTime({
 						personId: this.serviceTeacherList[0].personId,
 						date: this.periodDate.label,

orderPages/storeService/index.rpx.scss

@@ -20,9 +20,9 @@
   margin-top: 24rpx;
 }
 .serobReminder{
-  margin-top: 20rpx;
-  line-height: 40rpx;
-  color: red;
+  margin-top: 10rpx;
+  font-size: 28rpx;
+  color: #999999;
 }
 .serobReminder:first-child{
   margin-top: 0;
@@ -39,11 +39,11 @@
   padding: 0 24rpx;
 }
 .tabBarLineHeight {
-  height: 138rpx;
+  height: 220rpx;
 }
 .tabBarView {
   width: 750rpx;
-  height: 138rpx;
+  height: 200rpx;
   background: #ffffff;
   position: fixed;
   left: 0;
@@ -53,11 +53,12 @@
   .submitButton {
     text-align: center;
     line-height: 84rpx;
-    width: 85vw;
+    width: 686rpx;
     margin: 0 auto;
     height: 84rpx;
     background: #FFE05C;
     border-radius: 54rpx;
+    margin-top: 20rpx;
 
   }
 }
@@ -240,3 +241,19 @@
 .scroll-y1{
   height: 500rpx;
 }
+
+
+.btnTitle1{
+  font-size: 24rpx;
+  font-weight: 400;
+  margin-top: 20rpx;
+  color: #333333;
+  line-height: 44rpx;
+  padding: 0 32rpx;
+}
+.btnRight1 {
+  color: red;
+  font-size: 24rpx;
+  font-weight: 400;
+
+}

orderPages/storeService/index.vue

@@ -96,6 +96,13 @@
 		</view>
 		<view class="tabBarLineHeight "></view>
 		<view class="tabBarView">
+      <view v-if="recommendActivity" class="btnTitle1 flex-row justify-between">
+        <view>
+          <text>推荐活动：{{recommendActivity.title}}</text>
+          <text style="margin-left: 10rpx;color: #999999" >（{{recommendActivity.description}}）</text>
+        </view>
+        <text class="btnRight1" @click="goDetail(recommendActivity)">去购买</text>
+      </view>
 			<view class="submitButton " @click="openSetting">提交</view>
 		</view>
 
@@ -160,6 +167,7 @@
 		},
 		data() {
 			return {
+        recommendActivity:null,
 				msgType:null,
 				configContent:'',
 				timeoutId:null,
@@ -220,9 +228,12 @@
 				})
 			},1000*60*5)
       this.getExpireEquityCard()
+      this.getRecommendActivity();
 		},
 		onShow() {
 
+
+
 			//获取弹窗设置
 			let sameDayQueueContent = uni.getStorageSync('same_day_queue_content');
 			if (!sameDayQueueContent){
@@ -249,6 +260,18 @@
 		},
 		methods: {
 
+      goDetail(e){
+        uni.navigateTo({
+          url:'/orderPages/activityDetail/activityDetail?id=' + e.id
+        })
+      },
+
+      getRecommendActivity(){
+        this.$api.getRecommendActivity().then(res=>{
+          this.recommendActivity = res.data.data
+        })
+      },
+
       navigateTo(item){
         if(item.activityId){
           let list = item.activityId.split(',')
@@ -462,6 +485,11 @@
 					this.orderParam.childService = this.orderParam.childService.filter(selectServiceObject =>
 						selectServiceObject.serviceObjectId !== item.id)
 				} else {
+          uni.showModal({
+            title:"温馨提示",
+            content:"当前默认门店为" + this.storeInfo.storeName + "是否需要更换",
+            showCancel:false
+          })
 					let periodTimeList = JSON.parse(JSON.stringify(this.periodTimeList))
 					periodTimeList.forEach(i=>{
 						this.orderParam.childService.forEach(i1=>{

pages/index/index.vue

@@ -31,8 +31,8 @@
                 <!-- <image class="qrcode" src="../../static/index/qrcode.png" mode=""></image>
                 <view class="h-text">会员码</view> -->
                 <view class="coupon-wrap">
-                  <u-icon name="/static/me/u5.png" color="#ffb83d" size="22"></u-icon>
-                  <text>会员码</text>
+<!--                  <u-icon name="/static/me/u5.png" color="#ffb83d" size="22"></u-icon>-->
+                  <text>邀请有礼</text>
                 </view>
               </view>
             </view>
@@ -412,7 +412,8 @@ export default {
     },
     goQrCode() {
       uni.navigateTo({
-        url: '/pages/qrCode/index'
+        // url: '/pages/qrCode/index'
+        url: '/myPages/myActivity/myActivity'
       })
     },
     goActivity() {

pages/my/index.rpx.css

@@ -108,3 +108,8 @@
 .balanceItem{
     width: 33%;
 }
+.dian {
+    font-size: 60rpx;
+    font-weight: bold;
+    color: red;
+}

pages/my/index.vue

@@ -80,7 +80,13 @@
       <view class="group">
         <uni-list>
           <uni-list-item  :clickable="true" :title="item.title" showArrow :thumb="item.thumb" thumb-size="sm"
-                         :rightText="item.rightText" v-for="(item,index) in group1" :key="index" @click="clickListItem(item)"/>
+                         :rightText="item.rightText" v-for="(item,index) in group1" :key="index" @click="clickListItem(item)">
+            <template v-if="item.isShowRed" v-slot:footer>
+              <view class="flex-col justify-center">
+                <uni-icons size="12" color="red" type="smallcircle-filled"></uni-icons>
+              </view>
+            </template>
+          </uni-list-item>
         </uni-list>
       </view>
 
@@ -113,7 +119,7 @@ export default {
         {thumb: '/static/me/u826.png', title: '储值服务', rightText: '', to: '/myPages/recharge/index'},
         {thumb: '/static/me/u701.png', title: '交易记录', rightText: '', to: '/myPages/transactionRecord/index'},
         {thumb: '/static/me/u11.png', title: '会员须知', rightText: '', to: '/myPages/aboutOur/index'},
-        {thumb: '/static/me/familyCard_icon.png', title: '亲情卡', rightText: '', to: '/myPages/familyCard/index'},
+        {thumb: '/static/me/familyCard_icon.png', title: '亲情卡', rightText: '', to: '/myPages/familyCard/index' ,isShowRed:false},
         {thumb: '/static/me/hd.png', title: '我的活动', rightText: '', to: '/myPages/myActivity/myActivity'}
       ],
       group2: [
@@ -153,10 +159,21 @@ export default {
     // 	this.group1[0].rightText = '未实名认证，去认证'
     // }
     this.getUserInfo()
+    this.notReadRecordList()
   },
 
   methods: {
 
+    notReadRecordList(){
+      this.$api.notReadRecordList().then(res=>{
+        if (res.data.data.length > 0){
+          this.group1[6].isShowRed = true
+        }else {
+          this.group1[6].isShowRed = false
+        }
+      })
+    },
+
     getTemplateList(){
       let that = this
       that.$api.getTemplateList({

pages/order/module/index.rpx.css

@@ -398,10 +398,10 @@
     padding-right: 62rpx;
 }
 .planNumber1{
-    font-size: 20rpx;
+    font-size: 26rpx;
     font-family: PingFangSC-Regular, PingFang SC;
     font-weight: 400;
-    color: #999999;
+    color: red;
     line-height: 28rpx;
     padding-right: 62rpx;
 }

pages/order/module/mescrollUni-item.vue

@@ -82,8 +82,11 @@
 									</view>
 
 									<view class="planNumber1 flex-row justify-center">
-										<text>排号</text>
+										<text>C号段</text>
 									</view>
+                  <view class="planNumber1 flex-row justify-center">
+                    <text>提前半小时签到哟</text>
+                  </view>
 
 								</view>
 
@@ -124,8 +127,11 @@
 										</view>
 
 										<view class="planNumber1 flex-row justify-center">
-											<text>预约号</text>
+											<text>A号段</text>
 										</view>
+                    <view class="planNumber1 flex-row justify-center">
+                      <text>提前半小时签到哟</text>
+                    </view>
 									</view>
 								</view>
 							</view>

uni_modules/uni-icons/changelog.md

@@ -1,3 +1,9 @@
+## 2.0.12（2025-08-26）
+- 优化 uni-app x 下 size 类型问题
+## 2.0.11（2025-08-18）
+- 修复 图标点击事件返回
+## 2.0.9（2024-01-12）
+fix: 修复图标大小默认值错误的问题
 ## 2.0.8（2023-12-14）
 - 修复 项目未使用 ts 情况下，打包报错的bug
 ## 2.0.7（2023-12-14）

uni_modules/uni-icons/components/uni-icons/uni-icons.uvue

@@ -29,8 +29,8 @@
 				default: '#333333'
 			},
 			size: {
-				type: Object,
-				default: 24
+        type: [Number, String],
+        default: 16
 			},
 			fontFamily: {
 				type: String,
@@ -51,9 +51,9 @@
 			iconSize() : string {
 				const size = this.size
 				if (typeof size == 'string') {
-					const reg = /^[0-9]*$/g
-					return reg.test(size as string) ? '' + size + 'px' : '' + size;
-					// return '' + this.size
+				  const reg = /^[0-9]*$/g
+				  return reg.test(size as string) ? '' + size + 'px' : '' + size;
+				  // return '' + this.size
 				}
 				return this.getFontSize(size as number)
 			},

uni_modules/uni-icons/components/uni-icons/uni-icons.vue

@@ -50,7 +50,7 @@
 			},
 			size: {
 				type: [Number, String],
-				default: 24
+				default: 16
 			},
 			customPrefix: {
 				type: String,
@@ -85,8 +85,8 @@
 			}
 		},
 		methods: {
-			_onClick() {
-				this.$emit('click')
+			_onClick(e) {
+				this.$emit('click', e)
 			}
 		}
 	}
@@ -107,4 +107,4 @@
 		text-decoration: none;
 		text-align: center;
 	}
-</style>
+</style>

uni_modules/uni-icons/package.json

@@ -1,7 +1,7 @@
 {
   "id": "uni-icons",
   "displayName": "uni-icons 图标",
-  "version": "2.0.8",
+  "version": "2.0.12",
   "description": "图标组件，用于展示移动端常见的图标，可自定义颜色、大小。",
   "keywords": [
     "uni-ui",
@@ -11,12 +11,14 @@
 ],
   "repository": "https://github.com/dcloudio/uni-ui",
   "engines": {
-    "HBuilderX": "^3.2.14"
+    "HBuilderX": "^3.2.14",
+    "uni-app": "^4.08",
+    "uni-app-x": "^4.61"
   },
   "directories": {
     "example": "../../temps/example_temps"
   },
-"dcloudext": {
+  "dcloudext": {
     "sale": {
       "regular": {
         "price": "0.00"
@@ -34,55 +36,76 @@
       "permissions": "无"
     },
     "npmurl": "https://www.npmjs.com/package/@dcloudio/uni-ui",
-    "type": "component-vue"
+    "type": "component-vue",
+    "darkmode": "x",
+    "i18n": "x",
+    "widescreen": "x"
   },
   "uni_modules": {
-    "dependencies": ["uni-scss"],
+    "dependencies": [
+      "uni-scss"
+    ],
     "encrypt": [],
     "platforms": {
       "cloud": {
-        "tcb": "y",
-        "aliyun": "y"
+        "tcb": "x",
+        "aliyun": "x",
+        "alipay": "x"
       },
       "client": {
-        "App": {
-          "app-vue": "y",
-          "app-nvue": "y",
-          "app-uvue": "y"
+        "uni-app": {
+          "vue": {
+            "vue2": "√",
+            "vue3": "√"
+          },
+          "web": {
+            "safari": "√",
+            "chrome": "√"
+          },
+          "app": {
+            "vue": "√",
+            "nvue": "-",
+            "android": {
+                "extVersion": "",
+                "minVersion": "29"
+            },
+            "ios": "√",
+            "harmony": "√"
+          },
+          "mp": {
+            "weixin": "√",
+            "alipay": "√",
+            "toutiao": "√",
+            "baidu": "√",
+            "kuaishou": "-",
+            "jd": "-",
+            "harmony": "-",
+            "qq": "√",
+            "lark": "-"
+          },
+          "quickapp": {
+            "huawei": "√",
+            "union": "√"
+          }
         },
-        "H5-mobile": {
-          "Safari": "y",
-          "Android Browser": "y",
-          "微信浏览器(Android)": "y",
-          "QQ浏览器(Android)": "y"
-        },
-        "H5-pc": {
-          "Chrome": "y",
-          "IE": "y",
-          "Edge": "y",
-          "Firefox": "y",
-          "Safari": "y"
-        },
-        "小程序": {
-          "微信": "y",
-          "阿里": "y",
-          "百度": "y",
-          "字节跳动": "y",
-          "QQ": "y",
-					"钉钉": "y",
-					"快手": "y",
-					"飞书": "y",
-					"京东": "y"
-        },
-        "快应用": {
-          "华为": "y",
-          "联盟": "y"
-        },
-        "Vue": {
-            "vue2": "y",
-            "vue3": "y"
+        "uni-app-x": {
+          "web": {
+            "safari": "√",
+            "chrome": "√"
+          },
+          "app": {
+            "android": {
+                "extVersion": "",
+                "minVersion": "29"
+            },
+            "ios": "√",
+            "harmony": "√"
+          },
+          "mp": {
+            "weixin": "√"
+          }
         }
       }
     }
   }
-}
+}