Ver Fonte

2024-1-24

cmy há 1 ano atrás
pai
commit
ee01e564a2

+ 16 - 17
manifest.json

@@ -2,8 +2,8 @@
     "name" : "神英优选",
     "appid" : "__UNI__70BC0AE",
     "description" : "神英优选商城",
-    "versionName" : "2.7.5",
-    "versionCode" : 275,
+    "versionName" : "2.7.7",
+    "versionCode" : 277,
     "transformPx" : false,
     /* 5+App特有相关 */
     "app-plus" : {
@@ -23,11 +23,8 @@
         /* 模块配置 */
         "modules" : {
             "VideoPlayer" : {},
-            "Share" : {},
-            "OAuth" : {},
             "Payment" : {},
             "Maps" : {},
-            "LivePusher" : {},
             "Geolocation" : {},
             "Barcode" : {},
             "Camera" : {}
@@ -65,7 +62,7 @@
                     "<uses-permission android:name=\"android.permission.WRITE_EXTERNAL_STORAGE\"/>",
                     "<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>"
                 ],
-                "abiFilters" : [ "armeabi-v7a", "arm64-v8a", "x86" ],
+                "abiFilters" : [ "arm64-v8a", "x86" ],
                 "permissionExternalStorage" : {
                     "request" : "none",
                     "prompt" : "应用保存运行状态等信息,需要获取读写手机存储(系统提示为访问设备上的照片、媒体内容和文件)权限,请允许。"
@@ -73,7 +70,8 @@
                 "permissionPhoneState" : {
                     "request" : "none",
                     "prompt" : "为保证您正常、安全地使用,需要获取设备识别码(部分手机提示为获取手机号码)使用权限,请允许"
-                }
+                },
+                "targetSdkVersion" : 30
             },
             /* ios打包配置 */
             "ios" : {
@@ -82,6 +80,7 @@
                         "com.apple.developer.associated-domains" : [ "applinks:pro.crmeb.net" ]
                     }
                 },
+                "deploymentTarget" : "11.0",
                 "privacyDescription" : {
                     "NSLocationWhenInUseUsageDescription" : "根据客户地理位置推荐最近门店",
                     "NSPhotoLibraryUsageDescription" : "上传用户头像保存分享海报",
@@ -90,17 +89,12 @@
                     "NSLocationAlwaysUsageDescription" : "根据客户地理位置推荐最近门店",
                     "NSCameraUsageDescription" : "上传用户头像保存分享海报"
                 },
-                "idfa" : true,
+                "idfa" : false,
                 "dSYMs" : false
             },
             /* SDK配置 */
             "sdkConfigs" : {
                 "payment" : {
-                    "weixin" : {
-                        "__platform__" : [ "ios", "android" ],
-                        "appid" : "wx69a5bfe28c8b39e6",
-                        "UniversalLinks" : "https://pro.crmeb.net/uni-universallinks/__UNI__7E0054B/"
-                    },
                     "alipay" : {
                         "__platform__" : [ "ios", "android" ]
                     }
@@ -114,8 +108,9 @@
                 "push" : {},
                 "maps" : {
                     "amap" : {
-                        "appkey_ios" : "aeb768547b9d752891e37e1ca0a2b66d",
-                        "appkey_android" : "41ec5c3f4d110ce02a326210fe147be8"
+                        "appkey_ios" : "54fe38c4b02ae5c70968a79b81bcf379",
+                        "appkey_android" : "6075b730d6ffa53222744ecd47b68aff",
+                        "name" : "amapAhV2u8Ft"
                     }
                 },
                 "oauth" : {
@@ -129,9 +124,13 @@
                 "ad" : {},
                 "geolocation" : {
                     "amap" : {
+                        "name" : "amapAhV2u8Ft",
                         "__platform__" : [ "ios", "android" ],
-                        "appkey_ios" : "aeb768547b9d752891e37e1ca0a2b66d",
-                        "appkey_android" : "41ec5c3f4d110ce02a326210fe147be8"
+                        "appkey_ios" : "54fe38c4b02ae5c70968a79b81bcf379",
+                        "appkey_android" : "6075b730d6ffa53222744ecd47b68aff"
+                    },
+                    "system" : {
+                        "__platform__" : [ "ios", "android" ]
                     }
                 }
             },

Diff do ficheiro suprimidas por serem muito extensas
+ 0 - 14
pages/columnGoods/static/yhxy.html


Diff do ficheiro suprimidas por serem muito extensas
+ 0 - 14
pages/columnGoods/static/yszc.html


+ 2 - 3
pages/goods_details/index.vue

@@ -482,8 +482,7 @@
 						</div> -->
 								<!-- #endif -->
 								<!-- #ifdef APP-PLUS -->
-								<view class="item" @click="appShare('WXSceneSession')">
-									<!-- <view class="iconfont icon-weixin3"></view> -->
+								<!-- <view class="item" @click="appShare('WXSceneSession')">
 									<view class="pictrue">
 										<image src="../../static/images/weixin.png"></image>
 									</view>
@@ -494,7 +493,7 @@
 										<image src="./static/weixinCircle.png"></image>
 									</view>
 									<view class="">分享朋友圈</view>
-								</view>
+								</view> -->
 								<!-- #endif -->
 								<view class="item" @click="getpreviewImage">
 									<view class="pictrue">

+ 1 - 1
pages/order_addcart/order_addcart.vue

@@ -141,7 +141,7 @@
 					<view>暂无商品,去添加点什么吧</view>
 				</view>
         <!-- 热门推荐显示 -->
-				<recommend :hostProduct='hostProduct'></recommend>
+				<!-- <recommend :hostProduct='hostProduct'></recommend> -->
 			</view>
 			<view v-if="cartList.valid.length == 0 && cartList.invalid.length == 0 && loadend" style='height:30rpx;color: #F5F5F5;'></view>
 			<view v-else style='height:190rpx;color: #F5F5F5;'></view>

+ 4 - 2
pages/user/index.vue

@@ -235,6 +235,8 @@
 							<view class="txt">总资金</view>
 						</view>
 					</view>
+					<!-- #ifndef APP -->
+					
 					<view class="num-wrapper"
 						:class="[member_style==3?'unNum-wrapper':member_style==2?'Tnum-wrapper':'',((vip_type==2 && stu) || (vip_type==1 && memberStatus))?'':'height']"
 						v-if="userInfo.uid">
@@ -256,7 +258,7 @@
 							<view class="txt">消费分</view>
 						</view>
 					</view>
-
+					<!-- #endif -->
 					<!-- 新人礼物 -->
 					<view class="num-wrapper on" v-if="!userInfo.uid">
 						<image :src="giftPic" mode="" class="img"></image>
@@ -369,7 +371,7 @@
 					<!-- #endif -->
 					<!-- #ifdef APP-PLUS -->
 					<view class="item acea-row row-between-wrapper" hover-class="none"
-						@click="goMenuPage('/pages/users/privacy/index')">
+						@click="goMenuPage('/pages/users/privacy/index?type=privacy')">
 						<image src="/static/images/menu.png"></image>
 						<view class="text acea-row row-between-wrapper">
 							<view>隐私协议</view>

+ 22 - 3
pages/users/privacy/index.vue

@@ -34,14 +34,26 @@
 				},
 				content: ``,
 				sysHeight: sysHeight || 0,
-				type:''
+				type:'user'
 			}
 		},
 		onLoad(e) {
 			this.type = e.type;
+			uni.showLoading({
+				title: '加载中',
+				mask:true
+			});
 			if(e){
+				console.log(e,'e');
 				getUserAgreement(e.type).then(res => {
-					this.content = res.data.content
+					console.log(res,'res1');
+					this.content = res.data.content;
+					setTimeout(()=>{
+						this.$nextTick(()=>{
+							uni.hideLoading()
+						})
+					},5000)
+					
 				}).catch(err => {
 					that.$util.Tips({
 						title: err.msg
@@ -49,7 +61,14 @@
 				})
 			}else{
 				getUserAgreement('privacy').then(res => {
-					this.content = res.data.content
+					uni.hideLoading()
+					console.log(res,'res2');
+					this.content = res.data.content;
+					setTimeout(()=>{
+						this.$nextTick(()=>{
+							uni.hideLoading()
+						})
+					},5000)
 				}).catch(err => {
 					that.$util.Tips({
 						title: err.msg

+ 80 - 42
pages/users/user_info/index.vue

@@ -1,5 +1,5 @@
 <template>
-  <!-- 个人资料 -->
+	<!-- 个人资料 -->
 	<view>
 		<form @submit="formSubmit">
 			<view class='personal-data' :style="colorStyle">
@@ -44,7 +44,8 @@
 					</view>
 					<view class='item acea-row row-between-wrapper'>
 						<view>昵称</view>
-						<view class='input'><input type='nickname' name='nickname' :value='userInfo.nickname' maxlength="16"></input>
+						<view class='input'><input type='nickname' name='nickname' :value='userInfo.nickname'
+								maxlength="16"></input>
 						</view>
 					</view>
 					<view class='item acea-row row-between-wrapper'>
@@ -65,19 +66,24 @@
 							<text class='iconfont icon-suozi'></text>
 						</view>
 					</view>
-					<view class='item acea-row row-between-wrapper'  v-for="(item,index) in userInfo.register_extend_info" :key="index">
-						<view class="acea-row row-middle">{{item.info}}<text v-if="item.required==1" class="asterisk iconfont icon-xinghao"></text></view>
+					<view class='item acea-row row-between-wrapper'
+						v-for="(item,index) in userInfo.register_extend_info" :key="index">
+						<view class="acea-row row-middle">{{item.info}}<text v-if="item.required==1"
+								class="asterisk iconfont icon-xinghao"></text></view>
 						<!-- text -->
 						<view class='input' v-if="item.format == 'text'">
-							<input type='text' v-model="item.value" :placeholder="item.tip" placeholder-class="placeholder"></input>
+							<input type='text' v-model="item.value" :placeholder="item.tip"
+								placeholder-class="placeholder"></input>
 						</view>
 						<!-- number -->
 						<view class='input' v-if="item.format == 'num'">
-							<input type='number' v-model="item.value" :placeholder="item.tip" placeholder-class="placeholder"></input>
+							<input type='number' v-model="item.value" :placeholder="item.tip"
+								placeholder-class="placeholder"></input>
 						</view>
 						<!-- email -->
 						<view class='input' v-if="item.format == 'mail'">
-							<input type='text' v-model="item.value" :placeholder="item.tip" placeholder-class="placeholder"></input>
+							<input type='text' v-model="item.value" :placeholder="item.tip"
+								placeholder-class="placeholder"></input>
 						</view>
 						<!-- data -->
 						<view class="input acea-row row-middle row-right" v-if="item.format=='date'">
@@ -91,11 +97,13 @@
 						</view>
 						<!-- id -->
 						<view class='input' v-if="item.format == 'id'">
-							<input type='idcard' v-model="item.value" :placeholder="item.tip" placeholder-class="placeholder"></input>
+							<input type='idcard' v-model="item.value" :placeholder="item.tip"
+								placeholder-class="placeholder"></input>
 						</view>
 						<!-- phone -->
 						<view class='input' v-if="item.format == 'phone'">
-							<input type='tel' v-model="item.value" :placeholder="item.tip" placeholder-class="placeholder"></input>
+							<input type='tel' v-model="item.value" :placeholder="item.tip"
+								placeholder-class="placeholder"></input>
 						</view>
 						<!-- radio -->
 						<view class="input" v-if="item.format=='radio'">
@@ -103,17 +111,18 @@
 								<label class="label" v-for="(j ,jindex) in item.singlearr" :key="jindex">
 									<!-- <radio :value="j" :checked="item.value == j" /> -->
 									<!-- #ifndef MP -->
-									<radio :value="jindex.toString()" :checked='item.value == jindex'/>
+									<radio :value="jindex.toString()" :checked='item.value == jindex' />
 									<!-- #endif -->
 									<!-- #ifdef MP -->
-									<radio :value="jindex" :checked='item.value == jindex'/>
+									<radio :value="jindex" :checked='item.value == jindex' />
 									<!-- #endif -->
 									{{j}}
 								</label>
 							</radio-group>
 						</view>
 						<!-- address -->
-						<view class="input acea-row row-middle row-right" @click="addressList" v-if="item.format=='address'">
+						<view class="input acea-row row-middle row-right" @click="addressList"
+							v-if="item.format=='address'">
 							<!-- <picker mode="multiSelector" @change="bindRegionChange($event,index)"
 								@columnchange="bindMultiPickerColumnChange" :value="valueRegion"
 								:range="multiArray">
@@ -122,7 +131,8 @@
 								</view>
 							</picker>
 							<text class='iconfont icon-xiangyou'></text> -->
-							<input type='text' v-model="item.value" :placeholder="item.tip" placeholder-class="placeholder"></input>
+							<input type='text' v-model="item.value" :placeholder="item.tip"
+								placeholder-class="placeholder"></input>
 						</view>
 					</view>
 				</view>
@@ -206,11 +216,11 @@
 			uni.removeStorageSync('form_type_cart');
 		},
 		methods: {
-			getIsLogin(){
+			getIsLogin() {
 				toLogin()
 			},
 			// 省市区地址处理逻辑;
-			addressList(){
+			addressList() {
 				this.getCityList();
 			},
 			// 获取地址数据
@@ -242,7 +252,7 @@
 					this.multiArray = [province, city, area]
 				}
 			},
-			bindRegionChange(e,index) {
+			bindRegionChange(e, index) {
 				let multiIndex = this.multiIndex,
 					province = this.district[multiIndex[0]] || {
 						c: []
@@ -252,7 +262,7 @@
 					},
 					multiArray = this.multiArray,
 					value = e.detail.value;
-			
+
 				this.region = [multiArray[0][value[0]], multiArray[1][value[1]], multiArray[2][value[2]]]
 				this.userInfo.register_extend_info[index].value = city.v;
 				this.userInfo.register_extend_info[index].province = this.region[0];
@@ -302,7 +312,7 @@
 				// #endif
 				this.multiIndex = multiIndex
 			},
-			radioChange(e, index){
+			radioChange(e, index) {
 				this.userInfo.register_extend_info[index].value = e.detail.value
 			},
 			bindDateChange: function(e, index) {
@@ -394,23 +404,23 @@
 			getUserInfo: function() {
 				let that = this;
 				getUserInfo().then(res => {
-					res.data.register_extend_info.forEach(item=>{
-						if(item.format == 'radio'){
+					res.data.register_extend_info.forEach(item => {
+						if (item.format == 'radio') {
 							item.value = '0'
-						}else{
+						} else {
 							item.value = ''
-							if(item.format == 'address'){
+							if (item.format == 'address') {
 								item.province = "";
 								item.city = "";
 								item.district = "";
 							}
 						}
 					})
-					res.data.register_extend_info.forEach(item=>{
-						res.data.extend_info.forEach(j=>{
-							if(item.info === j.info){
+					res.data.register_extend_info.forEach(item => {
+						res.data.extend_info.forEach(j => {
+							if (item.info === j.info) {
 								item.value = j.value
-								if(item.format == 'address'){
+								if (item.format == 'address') {
 									let region = [j.province, j.city, j.district];
 									that.$set(that, 'region', region);
 								}
@@ -440,7 +450,24 @@
 			 */
 			uploadpic: function() {
 				let that = this;
-				this.canvasStatus = true
+				// #ifdef APP
+				uni.showModal({
+					title: "权限申请",
+					content: "是否允许访问相机及存储空间用于上传头像?",
+					success(res) {
+						if (res.confirm) {
+							that.commitImg();
+						}
+					}
+				})
+				// #endif
+				// #ifndef APP
+				that.commitImg();
+				// #endif
+			},
+			commitImg() {
+				let that = this;
+				that.canvasStatus = true
 				that.$util.uploadImageChange('upload/image', (res) => {
 					let userInfo = that.switchUserInfo[that.userIndex];
 					// if (userInfo !== undefined) {
@@ -448,13 +475,14 @@
 					// }
 					that.switchUserInfo[that.userIndex] = userInfo;
 					that.$set(that, 'switchUserInfo', that.switchUserInfo);
-					this.canvasStatus = false
+					that.canvasStatus = false
 				}, (res) => {
-					this.canvasStatus = false
+					that.canvasStatus = false
 				}, (res) => {
-					this.canvasWidth = res.w
-					this.canvasHeight = res.h
+					that.canvasWidth = res.w
+					that.canvasHeight = res.h
 				});
+
 			},
 			// 微信头像获取
 			onChooseAvatar(e) {
@@ -489,7 +517,7 @@
 								});
 							}
 						}
-						if(data.format === 'text'){
+						if (data.format === 'text') {
 							if (!data.value.trim()) {
 								return that.$util.Tips({
 									title: `${data.tip}`
@@ -539,7 +567,9 @@
 									});
 								}
 							}
-							if (!/^[1-9]\d{7}((0\d)|(1[0-2]))(([0|1|2]\d)|3[0-1])\d{3}$|^[1-9]\d{5}[1-9]\d{3}((0\d)|(1[0-2]))(([0|1|2]\d)|3[0-1])\d{3}([0-9]|X)$/i.test(data.value)) {
+							if (!
+								/^[1-9]\d{7}((0\d)|(1[0-2]))(([0|1|2]\d)|3[0-1])\d{3}$|^[1-9]\d{5}[1-9]\d{3}((0\d)|(1[0-2]))(([0|1|2]\d)|3[0-1])\d{3}([0-9]|X)$/i
+								.test(data.value)) {
 								return that.$util.Tips({
 									title: '请填写正确的身份证号码'
 								});
@@ -564,23 +594,28 @@
 </script>
 
 <style scoped lang="scss">
-	.personal-data{
+	.personal-data {
 		padding-bottom: 50rpx;
 	}
-	.dater{
+
+	.dater {
 		width: 400rpx;
 	}
-	.grab{
+
+	.grab {
 		color: #ccc !important;
 	}
-	.asterisk{
+
+	.asterisk {
 		color: red;
 		font-size: 20rpx;
 		margin-left: 6rpx;
 	}
-	.placeholder{
+
+	.placeholder {
 		color: #ccc;
 	}
+
 	.cartcolor {
 		color: var(--view-theme);
 		border: 1px solid var(--view-theme);
@@ -691,7 +726,8 @@
 		margin-left: 30rpx;
 		font-size: 32rpx;
 		color: #282828;
-		.label{
+
+		.label {
 			margin-right: 30rpx;
 		}
 	}
@@ -720,10 +756,12 @@
 		width: 460rpx;
 		text-align: right;
 		color: #868686;
-		input{
+
+		input {
 			text-align: right;
 		}
-		.picker{
+
+		.picker {
 			width: 400rpx;
 		}
 	}
@@ -768,4 +806,4 @@
 			border: 1px solid #eee;
 		}
 	}
-</style>
+</style>

Alguns ficheiros não foram mostrados porque muitos ficheiros mudaram neste diff