7-25

manifest.json

@@ -14,9 +14,7 @@
             "autoclose" : true,
             "delay" : 0
         },
-        "modules" : {
-            "Payment" : {}
-        },
+        "modules" : {},
         /* 模块配置 */
         "distribute" : {
             /* 应用发布信息 */
@@ -26,7 +24,6 @@
                     "<uses-permission android:name=\"android.permission.BLUETOOTH_ADMIN\"/>",
                     "<uses-permission android:name=\"android.permission.CALL_PHONE\"/>",
                     "<uses-permission android:name=\"android.permission.CHANGE_NETWORK_STATE\"/>",
-                    "<uses-permission android:name=\"android.permission.MODIFY_AUDIO_SETTINGS\"/>",
                     "<uses-permission android:name=\"android.permission.VIBRATE\"/>",
                     "<uses-permission android:name=\"android.permission.WAKE_LOCK\"/>",
                     "<uses-permission android:name=\"android.permission.BLUETOOTH_ADMIN\"/>"

pages/index/index.vue

@@ -23,19 +23,19 @@
 		<view class="jg"></view>
 		<!-- 分类 start-->
 		<view class="cate-section flex">
-			<view class="cate-item flex" @click="gozx">
-				<view class="img-wrapper flex">
-					<image src="../../static/icon/c1.png" mode=""></image>
-				</view>
-				<view class="item-title">易博甄选</view>
-			</view>
 			<view class="cate-item flex" @click="goCp()">
 				<view class="img-wrapper flex">
 					<image src="../../static/icon/c2.png" mode=""></image>
 				</view>
 				<view class="item-title">环球国际</view>
 			</view>
-			<view class="cate-item flex" @click="openGg()">
+			<view class="cate-item flex" @click="gozx">
+				<view class="img-wrapper flex">
+					<image src="../../static/icon/c1.png" mode=""></image>
+				</view>
+				<view class="item-title">易博甄选</view>
+			</view>
+			<view class="cate-item flex" @click="openGg()" v-if="isAndroid">
 				<view class="img-wrapper flex">
 					<image src="../../static/icon/c3.png" mode=""></image>
 				</view>
@@ -59,12 +59,13 @@
 		<view class="sbkh-wrap">
 			<image src="../../static/img/sbkh.jpg" mode=""></image>
 			<view class="sbkh-xfzq" @click.stop="nav('/pages/index/xfqzq')">
-				
+
 			</view>
 			<view class="sbkh-jfzq" @click="nav('/pages/index/bdzq')">
-				
+
 			</view>
 		</view>
+		<!-- 魔方 -->
 		<!-- 		<view class="zq-wrap flex">
 			<view class="zq-item" @click="nav('/pages/index/xfqzq')">
 				<view class="zq-tit">
@@ -124,12 +125,29 @@
 				</view>
 			</view>
 			<uni-load-more :status="loadingType"></uni-load-more>
-		</view>
 
+		</view>
+		<view class="page-btm" style="padding-top: 20rpx;">
+			©2022 浙江易博网络科技有限公司 版权所有
+		</view>
+		<view class="page-btm" @click="gocx" style="padding-bottom: 10rpx;">
+			浙ICP备2021013190号-9
+		</view>
 	</view>
 </template>
 
 <script>
+	import {
+		orderData,
+		getUserInfo
+	} from '@/api/user.js';
+	import {
+		saveUrl,
+		interceptor
+	} from '@/utils/loginUtils.js';
+	import {
+		isAndroid
+	} from '@/utils/platform.js'
 	import {
 		loadIndexs,
 		groom1,
@@ -145,12 +163,17 @@
 	export default {
 		data() {
 			return {
+
 				dataList: '',
 				carouselList: [], //轮播图列表
 				page: 1,
 				limit: 10,
 				list: [],
-				loadingType: 'more'
+				loadingType: 'more',
+				// #ifdef H5
+				isAndroid: false,
+				// #endif
+
 			};
 		},
 		onLoad() {
@@ -159,6 +182,13 @@
 		},
 		onShow() {
 			console.log(this.$dsbridge, 'dsbridge+++++++++++++')
+			// #ifdef H5
+			this.isAndroid = isAndroid()
+			// #endif
+			// #ifdef APP-PLUS
+			this.isAndroid = true
+			// #endif
+			console.log(this.isAndroid,'this.isAndroid')
 		},
 		onHide() {
 
@@ -167,7 +197,7 @@
 			this.getProduct()
 		},
 		computed: {
-			...mapState('user', ['userInfo'])
+			...mapState('user', ['userInfo', 'hasLogin'])
 		},
 		// 用户下拉刷新
 		async onPullDownRefresh() {
@@ -178,27 +208,33 @@
 			uni.stopPullDownRefresh()
 		},
 		methods: {
+			...mapMutations('user', ['setUserInfo']),
 			openGg() {
-				console.log(this.$dsbridge, 'this.$dsbridge')
-				this.$dsbridge.call("fnAds.onShowRewardVideoAD", {}, function(result) {
-					// alert(result);
-					// 奖励状态返回
-					// if(result.event)
-					let res = JSON.parse(result)
-					if (res.event == 'onReward') {
-
-						advertisement({
-							task: '1'
-						}).then(e => {
-							// alert('已观看')
-							// alert('奖励已发放')
-							// uni.showToast({
-							// 	title:'奖励已发放',
-							// 	duration:2000
-							// });
-						}).catch(err => {})
-					}
-				});
+				getUserInfo().then(({
+					data
+				}) => {
+					this.setUserInfo(data);
+					this.$dsbridge.call("fnAds.onShowRewardVideoAD", {}, function(result) {
+						// alert(result);
+						// 奖励状态返回
+						// if(result.event)
+						let res = JSON.parse(result)
+						if (res.event == 'onReward') {
+
+							advertisement({
+								task: '1'
+							}).then(e => {
+								// alert('已观看')
+								// alert('奖励已发放')
+								// uni.showToast({
+								// 	title:'奖励已发放',
+								// 	duration:2000
+								// });
+							}).catch(err => {})
+						}
+					});
+				})
+
 			},
 			goCp() {
 				window.location.href = 'http://web.mall.hqgjsmc.com/'
@@ -222,6 +258,7 @@
 					.catch(e => {});
 			},
 			nav(url) {
+
 				uni.navigateTo({
 					url,
 					fail() {
@@ -230,6 +267,8 @@
 						});
 					}
 				});
+
+
 			},
 			// 點擊搜索框
 			clickSearch() {
@@ -257,6 +296,9 @@
 						obj.loadingType = 'noMore'
 					}
 				})
+			},
+			gocx() {
+				window.location.href = 'https://www.miit.gov.cn/'
 			}
 
 		}
@@ -596,18 +638,58 @@
 			width: 750rpx;
 			height: 362rpx;
 		}
-		.sbkh-xfzq ,.sbkh-jfzq{
+
+		.sbkh-xfzq,
+		.sbkh-jfzq {
 			width: 340rpx;
 			height: 300rpx;
 			position: absolute;
 		}
+
 		.sbkh-xfzq {
 			top: 40rpx;
 			left: 27rpx;
 		}
+
 		.sbkh-jfzq {
 			top: 40rpx;
 			right: 27rpx;
 		}
 	}
+
+	.mf-wrap {
+		.mf {
+			transform-style: prserve-3d;
+			perspective: 500;
+			position: relative;
+			height: 200rpx;
+			width: 200rpx;
+			background-color: #bfa;
+		}
+
+		image {
+			position: absolute;
+			width: 100rpx;
+			height: 100rpx;
+		}
+
+		.top {
+			transform: rotateX(90deg);
+			transform-origin: 0 0;
+
+		}
+
+		.bottom {
+			transform: rotateX(90deg);
+			transform-origin: 0 100%;
+		}
+
+	}
+
+	.page-btm {
+		background-color: #f5f5f5;
+		font-size: 20rpx;
+		text-align: center;
+		color: #d6d6d8;
+	}
 </style>

pages/money/wallet.vue

@@ -12,8 +12,8 @@
 				<view>我的余额</view>
 			</view>
 			<view class="moneybtn-box">
-				<view class="money-btn">
-					
+				<view class="money-btn" @click="navto('/pages/user/xfjfzz?type=3')">
+					余额转账
 				</view>
 				<view class="money-btn" @click="navto('/pages/money/recharge')">
 					余额充值

pages/user/shareQrCode.vue

@@ -1,143 +1,184 @@
-<template>
-	<view class="container">
-		<image @longtap="bc_code" class="backImg" :src="backImg"></image>
-		<view class="tki-qrcode"><canvas @longtap="bc_code" canvas-id="qrcode" /></view>
-	</view>
-</template>
-
-<script>
-import { spreadBanner } from '@/api/user.js';
-export default {
-	// components: { tkiQrcode },
-	data() {
-		return {
-			url: '',
-			backImg: '',
-			userInfo: ''
-		};
-	},
-	onLoad() {
-		this.spread();
-	},
-	computed: {
-		cpSize() {
-			if (this.unit == 'upx') {
-				return uni.upx2px(this.size);
-			} else {
-				return this.size;
-			}
-		}
-	},
-	methods: {
-		spread() {
-			uni.showLoading({
-				title: '加载中'
-			});
-			let obj = this;
-			spreadBanner({
-				//#ifdef H5
-				type: 2,
-				//#endif
-				//#ifdef MP
-				type:1,
-				//#endif
-				//#ifdef APP-PLUS
-				type:2,
-				//#endif
-			}).then(({ data }) => {
-				console.log(data);
-				//#ifdef MP
-				obj.backImg = data[0].poster;
-				//#endif
-				//#ifdef H5
-				obj.backImg = data[0].wap_poster;
-				//#endif
-				//#ifdef APP-PLUS
-				obj.backImg = data[0].wap_poster;
-				//#endif
-				uni.hideLoading();
-			});
-		},
-		bc_code() {
-			let that = this;
-			console.log('保存二维码', this.backImg);
-			uni.downloadFile({
-				//获得二维码的临时地址
-				url: this.backImg,
-				success: res => {
-					//console.log('获取url',res)
-					if (res.statusCode == 200) {
-						uni.saveImageToPhotosAlbum({
-							filePath: res.tempFilePath, //传入临时地址
-							success() {
-								that.$api.msg('保存成功'); //封装的提示
-							},
-							fail() {
-								that.$api.msg('保存失败');
-							}
-						});
-					}
-				}
-			});
-		}
-	}
-};
-</script>
-
-<style lang="scss">
-page {
-	width: 100%;
-	min-height: 100%;
-	.container {
-		width: 100%;
-		height: 100%;
-	}
-}
-.backImg {
-	position: absolute;
-	width: 100%;
-	height: 100%;
-}
-.portrait {
-	width: 100%;
-	text-align: center;
-	padding-top: 80rpx;
-	padding-bottom: 30rpx;
-	image {
-		width: 250rpx;
-		height: 250rpx;
-	}
-}
-.text {
-	text-align: center;
-	width: 100%;
-	color: #ffffff;
-	font-size: 55rpx;
-	letter-spacing: 15rpx;
-}
-.uid-name {
-	padding: 50rpx 0rpx;
-	text-align: center;
-	width: 100%;
-	color: #ffffff;
-}
-.copy-btn {
-	color: #ffffff;
-	background-color: #4ba6ed;
-	border-radius: 50rpx;
-	width: 170rpx;
-	line-height: 70rpx;
-	margin: 0rpx auto;
-	text-align: center;
-}
-.tki-qrcode {
-	position: fixed;
-	bottom: 10%;
-	left: 30%;
-}
-canvas {
-	width: 150px;
-	height: 150px;
-	margin: auto;
-}
+<template>
+	<view class="container">
+		<image  class="backImg" :src="backImg" @click="bc_code(backImg)"></image>
+<!-- 		<view class="" @longtap="bc_code">
+			保存分享海报
+		</view> -->
+		<!-- <view class="tki-qrcode"><canvas @longtap="bc_code" canvas-id="qrcode" /></view> -->
+	</view>
+</template>
+
+<script>
+	import {
+		spreadBanner
+	} from '@/api/user.js';
+	export default {
+		// components: { tkiQrcode },
+		data() {
+			return {
+				url: '',
+				backImg: '',
+				userInfo: ''
+			};
+		},
+		onLoad() {
+			this.spread();
+		},
+		computed: {
+			cpSize() {
+				if (this.unit == 'upx') {
+					return uni.upx2px(this.size);
+				} else {
+					return this.size;
+				}
+			}
+		},
+		methods: {
+			spread() {
+				uni.showLoading({
+					title: '加载中'
+				});
+				let obj = this;
+				spreadBanner({
+					//#ifdef H5
+					type: 2,
+					//#endif
+					//#ifdef MP
+					type: 1,
+					//#endif
+					//#ifdef APP-PLUS
+					type: 2,
+					//#endif
+				}).then(({
+					data
+				}) => {
+					console.log(data);
+					//#ifdef MP
+					obj.backImg = data[0].poster;
+					//#endif
+					//#ifdef H5
+					obj.backImg = data[0].wap_poster;
+					//#endif
+					//#ifdef APP-PLUS
+					obj.backImg = data[0].wap_poster;
+					//#endif
+					uni.hideLoading();
+				});
+			},
+			bc_code(imgUrl) {
+
+				let that = this;
+				console.log('保存二维码', this.backImg);
+				uni.downloadFile({
+					//获得二维码的临时地址
+					url: this.backImg,
+					success: res => {
+						//console.log('获取url',res)
+						if (res.statusCode == 200) {
+							uni.saveImageToPhotosAlbum({
+								filePath: res.tempFilePath, //传入临时地址
+								success() {
+									that.$api.msg('保存成功'); //封装的提示
+								},
+								fail() {
+									that.$api.msg('保存失败');
+								}
+							});
+						}
+					}
+				});
+				// let imageUrl = 'http://yg.hqgjsmc.com' + imgUrl
+				// window.URL = window.URL || window.webkitURL;
+				// var xhr = new XMLHttpRequest();
+				// console.log(xhr,imgUrl)
+				// xhr.open("get", imgUrl, true);
+				// xhr.responseType = "blob";
+				// xhr.onload = function() {
+				// 	if (this.status == 200) {
+				// 		//得到一个blob对象
+				// 		var blob = this.response;
+				// 		console.log("blob", blob)
+				// 		// 至关重要
+				// 		let oFileReader = new FileReader();
+				// 		oFileReader.onloadend = function(e) {
+				// 			// 此处拿到的已经是base64的图片了,可以赋值做相应的处理
+				// 			console.log(e.target.result)
+				// 		}
+				// 		oFileReader.readAsDataURL(blob);
+				// 	}
+				// }
+				// xhr.send();
+				// alert(xhr.send())
+				// console.log(xhr.send(),'ddddddddddddddd')
+			}
+		}
+	};
+</script>
+
+<style lang="scss">
+	page {
+		width: 100%;
+		min-height: 100%;
+
+		.container {
+			width: 100%;
+			height: 100%;
+		}
+	}
+
+	.backImg {
+		position: absolute;
+		width: 100%;
+		// width: 750rpx;
+		height: 100%;
+	}
+
+	.portrait {
+		width: 100%;
+		text-align: center;
+		padding-top: 80rpx;
+		padding-bottom: 30rpx;
+
+		image {
+			width: 250rpx;
+			height: 250rpx;
+		}
+	}
+
+	.text {
+		text-align: center;
+		width: 100%;
+		color: #ffffff;
+		font-size: 55rpx;
+		letter-spacing: 15rpx;
+	}
+
+	.uid-name {
+		padding: 50rpx 0rpx;
+		text-align: center;
+		width: 100%;
+		color: #ffffff;
+	}
+
+	.copy-btn {
+		color: #ffffff;
+		background-color: #4ba6ed;
+		border-radius: 50rpx;
+		width: 170rpx;
+		line-height: 70rpx;
+		margin: 0rpx auto;
+		text-align: center;
+	}
+
+	.tki-qrcode {
+		position: fixed;
+		bottom: 10%;
+		left: 30%;
+	}
+
+	canvas {
+		width: 150px;
+		height: 150px;
+		margin: auto;
+	}
 </style>

pages/user/withdrawal.vue

@@ -21,7 +21,7 @@
 		</view>
 		<view class="list">
 			<radio-group @change="tabRadio">
-				<label>
+				<!-- <label>
 					<view class="box">
 						<view class="icon iconfont iconweixin1"></view>
 						<view class="title-box">
@@ -37,8 +37,8 @@
 							<radio value="weixin" color="#c29963" :checked="type == 'weixin'" />
 						</view>
 					</view>
-				</label>
-				<label>
+				</label> -->
+				<!-- <label>
 					<view class="box">
 						<view class="icon iconfont iconzhifubao"></view>
 						<view class="title-box">
@@ -54,8 +54,8 @@
 							<radio value="alipay" color="#c29963" :checked="type == 'alipay'" />
 						</view>
 					</view>
-				</label>
-				<label>
+				</label> -->
+				<!-- <label>
 					<view class="box">
 						<view class="icon iconfont">
 							<image class="icon-img" src="/static/icon/i8.png" mode="aspectFit"></image>
@@ -73,7 +73,7 @@
 							<radio value="bank" color="#c29963" :checked="type == 'bank'" />
 						</view>
 					</view>
-				</label>
+				</label> -->
 			</radio-group>
 		</view>
 		<view class="row b-b" v-if="type == 'weixin'">
@@ -143,7 +143,7 @@
 		data() {
 			return {
 				weixin_no: '',
-				type: 'alipay', //提现方式
+				type: 'bank', //提现方式
 				money: '0.00', //可提现金额
 				freeze: '0.0', //冻结金额
 				withdrawal: '', //提现金额
@@ -218,14 +218,15 @@
 			},
 			// 提交
 			confirm() {
+				let obj = this
 				let data = {
 					extract_type: this.type, //bank -银行卡 alipay-支付宝 weixin-微信
 					money: this.withdrawal, //金额
 					type: this.jftype //0佣金1余额
 				};
-				if (this.withdrawal % 10 != 0) {
+				if (this.withdrawal % 100 != 0) {
 					uni.showToast({
-						title: '提现金额为10的倍数',
+						title: '提现金额为100的倍数',
 						duration: 2000,
 						mask: false,
 						icon: 'none'
@@ -260,12 +261,18 @@
 
 				extractCash(data)
 					.then(e => {
-						this.loadData()
+						// obj.loadData()
 						getUserInfo({})
 							.then(({
 								data
 							}) => {
-								this.setUserInfo(data);
+								obj.setUserInfo(data);
+								if(obj.jftype == 1) {
+									obj.money = obj.userInfo.integral
+								}
+								if(obj.jftype == 2) {
+									obj.money = obj.userInfo.dynamic_integral
+								}
 							})
 							.catch(e => {
 								console.log(e);

pages/user/xfjfzz.vue

@@ -5,6 +5,7 @@
 				<view class="buttom">
 					<view class="icon" v-if="type== 1">{{ userInfo.integral | getMoneyStyle }}</view>
 					<view class="icon" v-if="type== 2">{{ userInfo.dynamic_integral | getMoneyStyle }}</view>
+					<view class="icon" v-if="type== 3">{{ userInfo.now_money | getMoneyStyle }}</view>
 					<text class="text">可转账余额</text>
 				</view>
 			</view>
@@ -24,7 +25,7 @@
 				<view class="buttom" @click="withdrawal = userInfo.dynamic_integral" v-if="type== 2">全部转账</view>
 			</view>
 		</view>
-		<button class="add-btn up" :class="{ action: loding }" @click="!loding ? confirm() : ''">提交申请</button>
+		<button class="add-btn up" :class="{ action: loding }" @click="!loding ? confirm() : ''">转账</button>
 	</view>
 </template>
 
@@ -70,10 +71,14 @@
 					uni.setNavigationBarTitle({
 						title:'静态积分转账'
 					})
-				}else {
+				}else if(this.type == 2){
 					uni.setNavigationBarTitle({
 						title:'动态积分转账'
 					})
+				}else if(this.type == 3){
+					uni.setNavigationBarTitle({
+						title:'余额转账'
+					})
 				}
 			}
 		},

unpackage/cache/apk/apkurl

@@ -1 +1 @@
-https://ide.dcloud.net.cn/build/download/336d9770-d020-11ec-94b0-bf95a66d4379
+https://ide.dcloud.net.cn/build/download/14d7c450-073f-11ed-91ad-f5454a15e6e3

unpackage/cache/certdata

@@ -1,3 +1,3 @@
-andrCertfile=D:/2022/3/sxg/unpackage/res/base/sxg.keystore
-andrCertAlias=com.sxg.inc
+andrCertfile=D:/2022/7/hqshop/unpackage/res/base/hqyg.keystore
+andrCertAlias=com.hqyg.cn
 andrCertPass=7IwuiYJfyRjKKTfhI7sjzw==