1

api/request.js

@@ -16,8 +16,8 @@ const httpRequest = (params) => {
 
 	const json_data = {
 		appcode: 'DOPE+', //应用编码
-		appchannel: 'DOPEGOOGLE', //应用发布渠道
+		appchannel: 'DOPEFACEBOOK', //应用发布渠道
-		appver: '1.5.0', //应用版本
+		appver: '1.5.1', //应用版本
 		appname: 'cnic_buyer', //应用名称
 		manufacturer: 'HUAWEI', //设备生产商
 		phonebrand: 'HORNOR', //设备品牌

pages/account/index.vue

@@ -191,7 +191,7 @@
 						url: '../category/index'
 					},
 					{
-						src: '../../static/img/min.png',
+						src: '../../static/img/mini.png',
 						url: '../index/index2',
 						name: ''
 					},
@@ -309,12 +309,12 @@
 					if (res.error == 0) {
 						// if(res.data.page_code == 'HOMESALEICON'){
 						if (res.data.page_code == 'HOMESALEICON') {
-							let src =
+							let src = '../../static/img/mini.png'
-								'https://www.dopeplus.com/images/mapp_customized/202210/1665653173499940520.png'
+								// 'https://www.dopeplus.com/images/mapp_customized/202210/1665653173499940520.png'
 							// let src = 'https://www.dopeplus.com/images/mapp_customized/202211/1667961215280331818.png'
 							if (src == res.data.zones[0].blocks[0].block_pic) {
 								// this.tarbar[2].src = 'https://www.dopeplus.com/images/mapp_customized/202211/1667961215280331818.png'
-								this.tarbar[2].src = '../../static/img/min.png'
+								this.tarbar[2].src = '../../static/img/mini.png'
 							} else {
 								src = res.data.zones[0].blocks[0].block_pic
 								// this.tabar[2].src=src

pages/category/index.vue

@@ -91,7 +91,7 @@
 						url:'../category/index'
 					},
 					{
-						src:'../../static/img/min.png',
+						src:'../../static/img/mini.png',
 						name:'',
 						url:'../index/index2'
 					},

pages/index/index.vue

@@ -155,7 +155,7 @@
 						src: '../../static/img/Category1.png'
 					},
 					{
-						src: ''
+						src: '../../static/img/mini.png',
 					},
 					{
 						src: '../../static/img/cart1.png'
@@ -736,10 +736,10 @@
 					let url
 					if (res.error == 0) {
 						if (res.data.page_code == 'HOMESALEICON') {
-							let src =
+							let src = '../../static/img/mini.png'
-								'https://www.dopeplus.com/images/mapp_customized/202211/1667961215280331818.png'
+								// 'https://www.dopeplus.com/images/mapp_customized/202301/1672798872921358750.png'
 							if (src == res.data.zones[0].blocks[0].block_pic) {
-								this.tarbar[2].src = '../../static/img/min.png'
+								this.tarbar[2].src = '../../static/img/mini.png'
 							} else {
 								src = res.data.zones[0].blocks[0].block_pic
 								// this.tabar[2].src=src
@@ -1298,7 +1298,7 @@
 				console.log(item,'item')
 				// console.log(item.block_link.includes('dope.adspecial'))
 				let goodid
-				console.log(goodid);
+				// console.log(goodid);
 				if (item.goodid) {
 					uni.navigateTo({
 						url: '../productDetails/index?goodid=' + item.goodid
@@ -1307,6 +1307,7 @@
 					const i = item.block_link.indexOf('?')
 					goodid = item.block_link.substring(i);
 					//////console.log(item.block_link)
+					console.log(item.block_link);
 					if (item.block_link.includes('goodslist')) {
 						uni.navigateTo({
 							url: '../category/productList' + goodid + '&tag=1'
@@ -1323,7 +1324,11 @@
 						uni.navigateTo({
 							url: '../specialTitle/index' + goodid 
 						})
-					} 
+					} else if (item.block_link.includes('dope.fenlei')) {
+						uni.switchTab({
+							url: '../category/index'
+						})
+					}
 				}
 				this.countdownTime2 = 0
 			},

pages/login/index.vue

@@ -63,7 +63,7 @@
 						<view class="agreement_right">
 							by continuong, you agree to be <text class="text" @click="gotonewpage(1)"> terms of use
 							</text> and <text class="text" @click="gotonewpage(2)"> privacy policy</text>.
-						</view>
+						</view> 
 					</view>
 					<view class="cellphone" style="padding-top: 15px;">
 						<view class="cellphone-box">
@@ -277,32 +277,33 @@
 						}  
 					}  
 					appleOauth.login( function(oauth){  
-						console.log(oauth);
-						uni.navigateBack({
-							delta: 1
-						});
-						// 授权成功，苹果授权返回的信息在 oauth.target.appleInfo 中    
-						// const openid = JSON.parse(oauth.target.appleInfo.identityToken)
-						// console.log(openid);
 						let data = {
 							_action: 'loginbyapple',
 							ap_user_id: oauth.target.appleInfo.user,
-							ap_user_name: oauth.target.appleInfo.familyName,
+							ap_user_name: oauth.target.appleInfo.fullName.familyName,
-							ap_user_first_name: oauth.target.appleInfo.familyName,
+							ap_user_first_name: oauth.target.appleInfo.fullName.familyName,
-							ap_user_middle_name: oauth.target.appleInfo.givenName,
+							ap_user_middle_name: oauth.target.appleInfo.fullName.givenName,
-							ap_user_last_name: oauth.target.appleInfo.familyName,
+							ap_user_last_name: oauth.target.appleInfo.fullName.familyName,
 							ap_user_email: oauth.target.appleInfo.email
 						}
-						uni.setStorageSync('isLogin', 1)
 						
 						// uni.setStorageSync('user_info', {nickname: oauth.target.appleInfo.familyName})
 						// uni.setStorageSync('user_info', {email: oauth.target.appleInfo.email})
 						defaultRequest(data).then(res => {
 							console.info(res)
-							uni.showLoading({
+							// uni.showLoading({
-								title: 'Logining',
+							// 	title: 'Logining',
-							})
+							// })
+							uni.navigateBack({
+								delta: 1
+							});
 						})
+						console.log(oauth);
+						uni.setStorageSync('isLogin', 1)
+						// 授权成功，苹果授权返回的信息在 oauth.target.appleInfo 中    
+						// const openid = JSON.parse(oauth.target.appleInfo.identityToken)
+						// console.log(openid);
+						
 						console.log(this.loginDate)
 						defaultRequest1(this.loginDate).then(res => {
 							app.globalData.error = res.error
@@ -347,9 +348,8 @@
 								}
 							}
 						})
-						uni.navigateBack({
+						
-							delta: 1
+						
-						});
 						// defaultRequest(data).then(res => {
 						// 	console.info(res)
 						// 	console.log('====================================');
@@ -518,9 +518,13 @@
 						// uni.setStorageSync('user_info.data.nickname', 'googleOauth.authResult.nickName');
 						defaultRequest(data).then(res => {
 							console.info(res)
-							uni.showLoading({
+							// uni.showLoading({
-								title: 'Logining',
+							// 	title: 'Logining',
-							})
+							// 	duration: 2000
+							// })
+							uni.navigateBack({
+								delta: 1
+							});
 						})
 						console.log(this.loginDate)
 						defaultRequest1(this.loginDate).then(res => {
@@ -566,9 +570,8 @@
 								}
 							}
 						})
-						uni.navigateBack({
+						
-							delta: 1
+						
-						});
 					}, function(err) {
 						console.log(err);
 						uni.showLoading({

pages/productDetails/index.vue

@@ -38,7 +38,7 @@
 					<swiper-item :touchable="true" v-if="goodsDate.goods_video">
 						<view class="swiper-item uni-bg-black" 
 							:style="{ background: 'url(' + goodsDate.gallery_list[0].img_url + ')'}">
-							<video v-if="video" :autoplay="true" :enable-progress-gesture="true" muted=""
+							<video v-if="video" :autoplay="true" :enable-progress-gesture="true" loop="" muted=""
 								:mobilenet-hint-type="1" class="video_play" :http-cache="true" @pause="VideoPuse()"
 								object-fit="contain" :direction="0" :src=" goodsDate.goods_video" :show-mute-btn="true"
 								@touchstart="touchStart" @touchend="touchEnd">
@@ -470,8 +470,10 @@
 		defaultRequest2,
 		defaultRequest4
 	} from '../../api/index.js'
-	const fb = require('facebook-node-sdk');
+	// const fb = require('facebook-node-sdk');
 	const app = getApp()
+	// var FacebookShare = require('facebook-share-link')
+	// var share = FacebookShare(884982142884404)
 	export default {
 		data() {
 			return {
@@ -1124,7 +1126,11 @@
 				  // }, function(response){
 				  //   console.log(response);
 				  // });
-				
+				// var share = FacebookShare(884982142884404)
+				// share({
+				//   href: 'http://www.my-website.com',
+				//   display: 'popup'  
+				// })
 			},
 			// 分享1复制
 			Copylink() {

pages/shippingCart/index.vue

@@ -324,7 +324,7 @@
 						url:'../category/index'
 					},
 					{
-						src:'../../static/img/min.png',
+						src:'../../static/img/mini.png',
 						name:''
 					},
 					{