修改一些样式

pages.json

@@ -614,6 +614,8 @@
 				"path":"companyInfo" //企业信息
 			},{
 				"path":"activitysignUp"//活动报名 相亲模式
+			},{
+				"path":"baomingorder"//报名订单
 			}]
		}
     ],
     "globalStyle": {

pages/appointment/personal/pointBalance.vue

@@ -2,7 +2,7 @@
 	<view class="pointBalance">
 		<view class="balancetop">
 			<view class="topbox">
-				<span style='font-size: 12px;color: #1B1D1E;'>账户余额（点数）</span>
+				<span style='font-size: 12px;color: #1B1D1E;'>账户余额（{{IsOpenMiAi==0?'点数':'星星'}}）</span>
 				<span style='font-size: 25px;color: #111111;'>{{PointNum}}</span>
 				<view class="recharge" v-if="IsShowRecharge == 1" @click="gopointRecharge">
 					充值
@@ -45,7 +45,7 @@
 					   {{x.Type==1?'+'+x.PonitNum:'-'+x.PonitNum}}
 				   </view>
 				   <view class="item-r" v-if='current==1' :style="{color: mainColor}">
-					   点数+{{x.PonitNum}} <text v-if="x.GivePoint>0">(赠{{x.GivePoint}})</text>
+					   {{IsOpenMiAi==0?'点数':'星星'}}+{{x.PonitNum}} <text v-if="x.GivePoint>0">(赠{{x.GivePoint}})</text>
 				   </view>
 				  </view>
 				</view>
@@ -102,6 +102,7 @@
 				  loading: "努力加载中",
 				  nomore: "没有更多了",
 				},
+				IsOpenMiAi:0,
 			}
 		},
 		onLoad() {
@@ -127,10 +128,10 @@
 			this.mainColor = this.$uiConfig.mainColor;
 			this.secondary = this.$uiConfig.secondary;
 			uni.setNavigationBarTitle({
-				title: '余额点数'
+				title: '余额'
 			});
 			this.IsShowRecharge = uni.getStorageSync("basedata") ? uni.getStorageSync("basedata").mall.setting.IsShowRecharge:0//完成时打开
-			
+			this.IsOpenMiAi = uni.getStorageSync("mall_UserInfo")?uni.getStorageSync("mall_UserInfo").IsOpenMiAi:0;//是否开启相亲模式
 		},
 		methods:{
 			init(){

pages/appointment/personal/pointRecharge.vue

@@ -4,16 +4,16 @@
 			<u-avatar :src="mall_UserInfo.Photo" size="80" ></u-avatar>
 			<view class="recharge-top-r">
 				<text class="chaochu1"  style="font-size:13px;color: #111111;font-weight: bold;" >{{mall_UserInfo.Name}}</text>
-				<text class="chaochu1" style='font-size: 11px;color: #666666;'>可用点数：{{Point}}</text>
+				<text class="chaochu1" style='font-size: 11px;color: #666666;'>可用{{showName}}：{{Point}}</text>
 			</view>
 		</view>
 		<view class="recharge-c">
-			<text style="font-size: 11px;color: #111111;">充点数 <text style="color: #DD0000;"> (虚拟商品支付成功后不支持退款)</text></text>
+			<text style="font-size: 11px;color: #111111;">充{{showName}} <text style="color: #DD0000;"> (虚拟商品支付成功后不支持退款)</text></text>
 		</view>
 		<view class="rechargelist ">
 			<view class="rechargeitem" @click="btnRecharge(item)" :style="{'border':'1px solid '+mainColor,'color':mainColor}" v-for="(item, index) in pointGoods" :key="index">
 				<text class="chaochu1-t" >{{item.SellingPrice}}元</text>
-				<text class="chaochu1-t" style="margin-top: 7px;font-size: 11px;">点数 {{item.PonitNum}}{{item.GivePoint>0?'+送'+item.GivePoint:''}}</text>
+				<text class="chaochu1-t" style="margin-top: 7px;font-size: 11px;">{{showName}} {{item.PonitNum}}{{item.GivePoint>0?'+送'+item.GivePoint:''}}</text>
 			</view>
 		</view>
 		<u-modal v-model="show" :content="content" :show-cancel-button='true' @confirm='queren'></u-modal>
@@ -37,6 +37,8 @@
 				content:'',
 				orderInfo:{},
 				Point:0,
+				IsOpenMiAi:0,
+				showName:'点数',
 			}
 		},
 		onLoad() {
@@ -46,9 +48,13 @@
 			this.mainColor = this.$uiConfig.mainColor;
 			this.secondary = this.$uiConfig.secondary;
 			uni.setNavigationBarTitle({
-				title: '余额点数'
+				title: '充值余额'
 			});
 			this.mall_UserInfo = uni.getStorageSync("mall_UserInfo") ? uni.getStorageSync("mall_UserInfo"):{};
+			this.IsOpenMiAi = uni.getStorageSync("mall_UserInfo")?uni.getStorageSync("mall_UserInfo").IsOpenMiAi:0;//是否开启相亲模式
+			if(this.IsOpenMiAi==1){
+				this.showName= '星星'
+			}
 			this.getPointGoodsList()
 			this.getdianshu()
 		},
@@ -75,7 +81,7 @@
 			},
 			btnRecharge(item){//点击充值
 				this.show= true;
-				this.content= '确定花费'+item.SellingPrice+'元充值点数'+item.PonitNum+'吗？'
+				this.content= '确定花费'+item.SellingPrice+'元充值'+this.showName+item.PonitNum+'吗？'
 				this.RechargeMsg.Income = item.SellingPrice;
 				this.RechargeMsg.PointGoodsId = item.ID;
 			},

pages/blindDate/personal/mysignupList.vue

@@ -12,7 +12,7 @@
     <view
       v-if="g.length > 0"
       style="
-        height: calc(100vh - 50px);
+        height: calc(100vh);
         width: calc(100vw);
         overflow: hidden;
 		padding-bottom: 50px;

pages/kotra/activityList.vue

@@ -60,7 +60,7 @@
 						</view>
 						<view class="activeRight">
 							<view>活动类型：{{item.ActivityTypeName}}</view>
-							<view style="margin:10px 0">开放时间：{{item.StartTimeStr}}</view>
+							<view style="margin:10px 0">开始时间：{{item.StartTimeStr}}</view>
 							<view>结束时间：{{item.EndTimeStr}}</view>
 						</view>
 					</view>

pages/kotra/activitysignUp.vue

@@ -175,9 +175,12 @@ export default {
 						icon: 'none',
 						duration: 2000
 					});
-					uni.redirectTo({
-						url: '/pages/kotra/activityList' 
-					})
+					setTimeout(()=>{
+						uni.redirectTo({
+							url: '/pages/kotra/baomingorder' 
+						})
+					},1000)
+					
 					
 				}
 			}

pages/user-center/components/blinddate-user.vue

@@ -65,7 +65,7 @@
 					<span style='font-size: 14px;color: #555555;margin-left: 15px'>我的星星值：</span>
 				</view>
 				<view style="display: flex;align-items: center;">
-					<span style='font-size: 12px;color: #A5A4AC;font-family: aa;margin-right: 20px;'>{{user_info.pointnum}}</span>
+					<span style='font-size: 12px;color: #A5A4AC;font-family: aa;margin-right: 20px;'>{{PointNum}}</span>
 					<u-icon name="arrow" color="#A5A4AC" size="20"></u-icon>
 				</view>
 			</view>
@@ -95,7 +95,7 @@
 
 <script>
 	export default{
-		props: ["meueData",'user_info','scrollTop','modelstype','bottommargin'],
+		props: ["meueData",'user_info','scrollTop','modelstype','bottommargin','PointNum'],
 		data(){
 			return{
 				pageTitle: '用户中心',

pages/user-center/user-center.vue

@@ -174,6 +174,7 @@
 			:scrollTop='scrollTop'
 			:modelstype='modelstype'
 			:bottommargin='bottommargin'
+			:PointNum='PointNum'
 			>
 				
 			</blinddate>