代码提交

components/share.vue

@@ -9,11 +9,11 @@
 							<image src="@/static/icon-share-03.png"></image>
 							<view class="txt">生成海报</view>
 						</view>
-						<view class="item" @click="appShare('WXSceneSession',2)">
+						<view class="item" v-if="isShowShare" @click="appShare('WXSceneSession',2)">
 							<image src="@/static/icon-share-01.png"></image>
 							<view class="txt">微信好友</view>
 						</view>
-						<view class="item" @click="appShare('WXSceneTimeline',2)">
+						<view class="item" v-if="isShowShare" @click="appShare('WXSceneTimeline',2)">
 							<image src="@/static/icon-share-02.png"></image>
 							<view class="txt">朋友圈</view>
 						</view>
@@ -29,7 +29,7 @@
 				<template v-if="type==2">
 					<view class="titles">分享<image @click="closePopup()" src="@/static/cha.png"></image></view>
 					<view class="content">
-						<view class="item" @click="appShare('WXSceneSession',0)">
+						<view class="item" v-if="isShowShare" @click="appShare('WXSceneSession',0)">
 							<image src="@/static/icon-share-01.png"></image>
 							<view class="txt">微信</view>
 						</view>
@@ -46,7 +46,12 @@
 
 <script>
 	export default {
-		name:"insufficient",
+		name:"insufficient",
+		data() {
+			return {
+				isShowShare: false
+			}
+		},
 		props: {
 			info: {
 				type: Object,
@@ -60,6 +65,24 @@
 				type: Number,
 				default: 2
 			},
+		},
+		watch: {
+		  isShare: function (val, oldVal) {
+		    if(val == true){
+		  	  const that = this;
+			  console.log(111)
+			  uni.getProvider({
+			  	service: "share",
+				success(res) {
+					if(res.provider[0]=='weixin'){
+						that.isShowShare = true
+					}else{
+						that.isShowShare = false
+					}
+				}
+			  })
+		    }
+		  }
 		},
 		methods: {
 			confirm() {

manifest.json

@@ -110,7 +110,8 @@
                     },
                     "alipay" : {
                         "__platform__" : [ "ios", "android" ]
-                    }
+                    },
+                    "appleiap" : {}
                 },
                 "push" : {}
             },

pages/peiwan/detail.vue

@@ -77,7 +77,7 @@
 		<view class="user-bd" v-if="current==1">
 			<view class="yuewan">
 				<view class="title">约玩项目
-				<view class="location">
+				<view class="location" v-if="distance">
 					<image src="@/static/dingwei.png"></image>距离{{distance}}km
 				</view>
 				</view>
@@ -86,16 +86,16 @@
 						<view class="name">{{a.name}}</view>
 						<view class="price">{{a.price}}起</view>
 					</view>
-					<view class="empty" v-if="isShow">
+					<view class="empty" v-if="sellerServiceList && sellerServiceList.length == 0">
 						<image src="@/static/empty.png"></image>
-						<view class="txt">暂无数据</view>
+						<view class="txt">还没有发布项目</view>
 					</view>
 				</view>
 			</view>
 		</view>
 		<view class="user-bd" v-if="current==2">
 			<view class="dongtai">
-				<view class="empty" v-if="isShow">
+				<view class="empty" v-if="articleList && articleList.length == 0">
 					<image src="@/static/empty.png"></image>
 					<view class="txt">暂无数据</view>
 				</view>

pages/users/center/index.vue

@@ -111,15 +111,29 @@
 			<view class="title">支付方式</view>
 			<view class="pay" v-if="payInfo && payInfo.length >= 1">
 				<template v-for="(a,i) in payInfo">
-					<view class="item" v-if="a=='wx-1' || a=='ali-1' || a=='integral-1'" :key="i" :class="payIndex == i?'item-on':''" @click="tabPay(i,a)">
+					<template v-if="platform == 'ios'">
-						<view class="a" v-if="a=='wx-1'"><image src="@/static/wxpay.png"></image>微信支付</view>
+						<view class="item" v-if="a=='wx-1' || a=='ali-1' || a=='integral-1' || a=='ios-1'" :key="i" :class="payIndex == i?'item-on':''" @click="tabPay(i,a)">
-						<view class="a" v-if="a=='ali-1'"><image src="@/static/zfb.png"></image>支付宝支付</view>
+							<view class="a" v-if="a=='wx-1'"><image src="@/static/wxpay.png"></image>微信支付</view>
-						<view class="a" v-if="a=='integral-1'"><image src="@/static/yue.png"></image>余额支付<text>（账户余额{{userInfo.money}}元）</text></view>
+							<view class="a" v-if="a=='ali-1'"><image src="@/static/zfb.png"></image>支付宝支付</view>
-						<view class="b">
+							<view class="a" v-if="a=='integral-1'"><image src="@/static/yue.png"></image>余额支付<text>（账户余额{{userInfo.money}}元）</text></view>
-							<image class="img1" src="@/static/icon-check.png"></image>
+							<view class="a" v-if="a=='ios-1'"><image src="@/static/pgzf.png"></image>苹果支付</view>
-							<image class="img2" src="@/static/icon-check-on.png"></image>
+							<view class="b">
+								<image class="img1" src="@/static/icon-check.png"></image>
+								<image class="img2" src="@/static/icon-check-on.png"></image>
+							</view>
 						</view>
-					</view>
+					</template>
+					<template v-else>
+						<view class="item" v-if="a=='wx-1' || a=='ali-1' || a=='integral-1'" :key="i" :class="payIndex == i?'item-on':''" @click="tabPay(i,a)">
+							<view class="a" v-if="a=='wx-1'"><image src="@/static/wxpay.png"></image>微信支付</view>
+							<view class="a" v-if="a=='ali-1'"><image src="@/static/zfb.png"></image>支付宝支付</view>
+							<view class="a" v-if="a=='integral-1'"><image src="@/static/yue.png"></image>余额支付<text>（账户余额{{userInfo.money}}元）</text></view>
+							<view class="b">
+								<image class="img1" src="@/static/icon-check.png"></image>
+								<image class="img2" src="@/static/icon-check-on.png"></image>
+							</view>
+						</view>
+					</template>
 				</template>
 			</view>
 			<view class="agreement">
@@ -135,9 +149,11 @@
 </template>
 
 <script>
+	const systemInfo = uni.getSystemInfoSync();
 	export default {
 		data() {
 			return {
+				platform: "ios",
 				list: [],
 				userInfo: {},
 				isToggle: false,
@@ -155,6 +171,8 @@
 			};
 		},
 		onReady() {
+			this.platform = systemInfo.platform;
+			console.log(systemInfo.platform)
 			this.getUserInfo();
 			this.getList();
 			this.getConfigData();
@@ -250,6 +268,24 @@
 						return ;
 					}
 				}
+				if(this.platform == 'ios'){
+					if(this.payType == 'ios-1'){
+						uni.getProvider({
+						  service: 'payment',
+						  success: (res) => {
+						    const iapChannel = res.providers.find((channel) => {
+								console.log(channel)
+						      return (channel.id === 'appleiap')
+						    })
+						
+						    // 如果 iapChannel 为 null，说明当前包没有包含iap支付模块。注意：HBuilder基座不包含 iap 通道
+							console.log(res)
+						  }
+						});
+					}
+					
+					return ;
+				}
 				uni.showLoading({
 					title: "正在支付"
 				})

pages/users/chat/index.vue

@@ -2,14 +2,16 @@
 	<view class="chat">
 		<view class="chat-navbar">
 			<u-navbar :title="title">
-				<view class="slot-wrap" slot="right" @click="toSheet()">
+				<view class="slot-wrap" v-if="userInfo.operrole == 0" slot="right" @click="toSheet()">
 					<u-icon name="more-dot-fill" color="#000000" size="30"></u-icon>
 				</view>
 			</u-navbar>
-		</view>
+		</view>
-		<view class="chat-hd" v-if="list.length>0">
+		<template v-if="userInfo.operrole == 0">
-			<u-notice-bar style="width: 100%;" :volume-icon="false" mode="horizontal" :list="list"></u-notice-bar>
+			<view class="chat-hd" v-if="list.length>0">
-		</view>
+				<u-notice-bar style="width: 100%;" :volume-icon="false" mode="horizontal" :list="list"></u-notice-bar>
+			</view>
+		</template>
 		<scroll-view id="wrapper" class="chat-bd"
 			:class="list.length==0?((isOpen || isBiaoqing)?'chat-bd-active1':'chat-bd-active'):(isOpen || isBiaoqing?'chat-bd-on':'')"
 			:scroll-y="true"
@@ -19,6 +21,7 @@
 		>
 			<view id="wrapper1">
 				<!-- 个人信息 -->
+				<template v-if="userInfo.operrole == 0">
 				<view class="info" v-if="chatList.length == 0">
 					<view class="hd">
 						<image class="avatar" :src="userInfo.faceImage?userInfo.faceImage:userInfo.img"></image>
@@ -49,7 +52,8 @@
 							<image v-for="(a,i) in userInfo.xiangce" @click="perviewImages(i)" :key="i" :src="a"></image>
 						</view>
 					</view>
-				</view>
+				</view>
+				</template>
 				<view class="item" :class="a.sendType == 1?'item-on':''" v-for="(a,index) in chatList" :key="index">
 					<!-- 增加字段：sendType   1我发给你  2你发给我 -->
 					<template v-if="a.sendType == 1">
@@ -87,7 +91,7 @@
 					</template>
 				</view>
 			
-				<view class="changyong">
+				<view class="changyong" v-if="chatList.length > 0">
 					<view class="li" @click="toSelect('你好')">你好</view>
 					<view class="li" @click="toSelect('很高兴认识你')">很高兴认识你</view>
 					<view class="li" @click="toSelect('可以认识下吗？')">可以认识下吗？</view>
@@ -96,7 +100,7 @@
 		</scroll-view>
 		<view class="chat-fd">
 			<view class="a">
-				<view class="luyin" @click="toToggle()">
+				<view class="luyin" v-if="userInfo.operrole == 0" @click="toToggle()">
 					<image v-if="isToggle" src="/static/chat-01.png"></image>
 					<image v-else src="/static/chat-05.png"></image>
 				</view>
@@ -127,10 +131,10 @@
 				<view class="dt" @click="uploadVideo()">
 					<image src="@/static/chat-xiangji.png"></image>
 				</view>
-				<view class="dt" @click="openShiping()">
+				<view class="dt" v-if="userInfo.operrole == 0" @click="openShiping()">
 					<image src="@/static/chat-yinshipin.png"></image>
 				</view>
-				<view class="dt" @click="openGift()">
+				<view class="dt" v-if="userInfo.operrole == 0" @click="openGift()">
 					<image src="@/static/chat-liwu.png"></image>
 				</view>
 			</view>
@@ -784,8 +788,11 @@
 						this.userInfo.xiangce = data.reserved1.split(",")
 					}
 					this.itemList = ["查看TA的主页", (data.isCare == 0?"关注":"取消关注"), "举报", (data.isBlack == 0?"加入黑名单":"移除黑名单")];
-					this.title = data.nickname+(data.isOnline == 1?"_(在线)":"_(离线)");
+					this.title = data.nickname+(data.isOnline == 1?"_(在线)":"_(离线)");
-					this.getConfigData();
+					if(data.operrole == 0){
+						this.getConfigData();
+					}
+					
 				}else{
 					uni.showToast({
 						title: msg,
@@ -1455,7 +1462,7 @@
 			}
 			.input{
 				flex: 1;
-				max-width: 400rpx;
+				// max-width: 400rpx;
 				height: 80rpx;
 				background: #FFFFFF;
 				border-radius: 10rpx;
@@ -1500,12 +1507,12 @@
 			width: 100%;
 			height: 260rpx;
 			display: flex;
-			justify-content: space-between;
 			border-top: 1px solid #E2E2E2;
 			padding: 0 45rpx;
 			box-sizing: border-box;
 			.dt{
-				flex: 1;
+				flex: 1;
+				max-width: 200rpx;
 				display: flex;
 				justify-content: center;
 				margin-top: 30rpx;

pages/users/recharge/index.vue

@@ -19,15 +19,29 @@
 				<view class="title">选择充值方式</view>
 				<view class="content">
 					<template v-for="(a,i) in payInfo">
-						<view class="item" v-if="a=='wx-1' || a=='ali-1' || a=='integral-1'" :key="i" :class="tabIndex == i?'item-on':''" @click="tabItem(i,a)">
+						<template v-if="platform == 'ios'">
-							<view class="a" v-if="a=='wx-1'"><image src="@/static/wxpay.png"></image>微信支付</view>
+							<view class="item" v-if="a=='wx-1' || a=='ali-1' || a=='integral-1' || a=='ios-1'" :key="i" :class="tabIndex == i?'item-on':''" @click="tabItem(i,a)">
-							<view class="a" v-if="a=='ali-1'"><image src="@/static/zfb.png"></image>支付宝支付</view>
+								<view class="a" v-if="a=='wx-1'"><image src="@/static/wxpay.png"></image>微信支付</view>
-							<view class="a" v-if="a=='integral-1'"><image src="@/static/yue.png"></image>余额支付<text>（账户余额{{userInfo.money}}元）</text></view>
+								<view class="a" v-if="a=='ali-1'"><image src="@/static/zfb.png"></image>支付宝支付</view>
-							<view class="b">
+								<view class="a" v-if="a=='integral-1'"><image src="@/static/yue.png"></image>余额支付<text>（账户余额{{userInfo.money}}元）</text></view>
-								<image class="img1" src="@/static/icon-check.png"></image>
+								<view class="a" v-if="a=='ios-1'"><image src="@/static/pgzf.png"></image>苹果支付</view>
-								<image class="img2" src="@/static/icon-check-on.png"></image>
+								<view class="b">
-							</view>
+									<image class="img1" src="@/static/icon-check.png"></image>
-						</view>
+									<image class="img2" src="@/static/icon-check-on.png"></image>
+								</view>
+							</view>
+						</template>
+						<template v-else>
+							<view class="item" v-if="a=='wx-1' || a=='ali-1' || a=='integral-1'" :key="i" :class="tabIndex == i?'item-on':''" @click="tabItem(i,a)">
+								<view class="a" v-if="a=='wx-1'"><image src="@/static/wxpay.png"></image>微信支付</view>
+								<view class="a" v-if="a=='ali-1'"><image src="@/static/zfb.png"></image>支付宝支付</view>
+								<view class="a" v-if="a=='integral-1'"><image src="@/static/yue.png"></image>余额支付<text>（账户余额{{userInfo.money}}元）</text></view>
+								<view class="b">
+									<image class="img1" src="@/static/icon-check.png"></image>
+									<image class="img2" src="@/static/icon-check-on.png"></image>
+								</view>
+							</view>
+						</template>
 					</template>
 				</view>
 				<view class="fd">
@@ -39,10 +53,12 @@
 	</view>
 </template>
 
-<script>
+<script>
+	const systemInfo = uni.getSystemInfoSync();
 	export default {
 		data() {
-			return {
+			return {
+				platform: "ios",
 				tabIndex: -1,
 				isPopup: false,
 				show: false,
@@ -59,7 +75,8 @@
 			}
 		},
 		onReady() {
-			const that = this;
+			const that = this;
+			that.platform = systemInfo.platform;
 			this.getList();
 			this.getConfigData();
 			this.getUserInfo();

uni_modules/vk-uview-ui/components/u-column-notice/u-column-notice.vue

@@ -19,8 +19,8 @@
 					:style="[textStyle]"
 					@tap="click(index)"
 					:class="['u-type-' + type]"
+					v-html="item"
 				>
-					{{ item }}
 				</view>
 			</swiper-item>
 		</swiper>

uni_modules/vk-uview-ui/components/u-row-notice/u-row-notice.vue

@@ -24,7 +24,7 @@
 					}"
 				>
 					<text class="u-notice-text" @tap="click" :style="[textStyle]"
-					:class="['u-type-' + type]">{{showText}}</text>
+					:class="['u-type-' + type]" v-html="showText"></text>
 				</view>
 			</view>
 			<view class="u-icon-wrap">

unpackage/cache/appleConfig.ini

@@ -2,7 +2,7 @@
 appleAppid=com.chunwan
 
 [appstore]
-appstore=c1a58664718e4a849c197fac826a7e68
+appstore=7864148d0dcea463a7d348b03defd004
 
 [iosStyle]
 iosStyle=
@@ -20,11 +20,11 @@ universalLinks_weibo=
 spaceid_weibo=
 
 [iphone]
-app%402x=fdb9712495e72aa51050ab779a9c023d
+app%402x=607979b192804df592721dfeea58b22a
-app%403x=95acdec0f97a741e4e77f6418cff9741
+app%403x=ade659ffc98e7803054c11071e57c30a
-notification%402x=25e3117175da74fc76bed47b405c08ea
+notification%402x=d20ba7dc662b1665d74171a3ba13b8c6
-notification%403x=c84a4eefed477cebd2d0f8ee2a42f6e3
+notification%403x=aa8d569b438cec37f1e097d9b53b7e26
-settings%402x=ee6dcc98cc74c02f42c237ff43b24b99
+settings%402x=dd683c2fb95f31659fcfb9049f790e7a
-settings%403x=e59fbdba037c5f8477e3697b789a8b81
+settings%403x=7adca45f70b85e1be889ffe381ace42f
-spotlight%402x=d5821232f5fae0dfc7f4929b534c306f
+spotlight%402x=f848e863ff6350594c2c12bec8146cf6
-spotlight%403x=fdb9712495e72aa51050ab779a9c023d
+spotlight%403x=607979b192804df592721dfeea58b22a

unpackage/cache/certdataios

@@ -1,3 +1,3 @@
-iosProfile=D:/仁周项目/2024-09-06  陪玩陪俩(纯玩)项目/chunwan/发布-ios_app_store.mobileprovision
+iosProfile=D:/仁周项目/2024-09-06  陪玩陪俩(纯玩)项目/chunwan/N8FALQ8QPS-ios_app_development.mobileprovision
-ioscertFile=D:/仁周项目/2024-09-06  陪玩陪俩(纯玩)项目/chunwan/发布-ios_distribution-p12/CXG3W4G273-ios_distribution.p12
+ioscertFile=D:/仁周项目/2024-09-06  陪玩陪俩(纯玩)项目/chunwan/DGY4Q7WK66-ios_development-p12/DGY4Q7WK66-ios_development.p12
-ioscertPassword=ffGC+00MkDTQ00zBfErOag==
+ioscertPassword=kh1D8MIbg8iTKvf3WkYKvw==

unpackage/cache/uts_custom_ios/app-ios-debug.json

@@ -1 +1 @@
-{"dir":"/Users/seaman/srv/bdserver.dcloud.net.cn/service/storage/app/package/IOS/queue/7057c530-9911-11ef-be2e-2bb9f813d003/wgtRoot/__UNI__7C06BEE/"}
+{"dir":"/Users/seaman/srv/bdserver.dcloud.net.cn/service/storage/app/package/IOS/queue/e1e52f10-9cd2-11ef-b12f-1535ea1c1532/wgtRoot/__UNI__7C06BEE/"}