1

ios/index.js

@@ -1,58 +0,0 @@
-// #import <CoreTelephony/CTCellularData.h>
-// // 尝试解决IOS白屏问题
-// //获取网络权限
-// - (void)checkNetworkPermissions{
-//     CTCellularData *cellularData = [[CTCellularData alloc] init];
-//     // 状态发生变化时调用
-//     cellularData.cellularDataRestrictionDidUpdateNotifier = ^(CTCellularDataRestrictedState restrictedState) {
-//         switch (restrictedState) {
-//             case kCTCellularDataRestrictedStateUnknown:
-//                 NSLog(@"蜂窝移动网络状态：未知");
-//                 break;
-//             case kCTCellularDataRestricted:
-//                 NSLog(@"蜂窝移动网络状态：关闭");
-//                 break;
-//             case kCTCellularDataNotRestricted:
-//                 NSLog(@"蜂窝移动网络状态：开启");
-//                 break;
-
-//             default:
-//                 break;
-//         }
-//     };
-// }
-/**
- * 全局混入型
- */
-// export default{
-//     data(){
-//         return {
-//                        //设置默认的分享参数
-//             typee: ''
-//         }
-//     },
-//     onShareAppMessage(res) {
-//         return {
-//             let that = this;
-//             let s = 0;
-//             let time = setInterval(() => {
-//             	uni.getNetworkType({
-//             		success: (res) => {
-//             			console.log(res.networkType, s);
-//             			if (res.networkType == 'none') {
-//             				uni.showToast({
-//             					icon: 'none',
-//             					title: 'Please connect to the network',
-//             					duration: 3000,
-//             				})
-//             			} else if (res.networkType !== 'none') {
-//             				that.typee = 2;
-//             				clearInterval(time);
-//             			}
-//             		}
-//             	})
-//             	s++;
-//             }, 1);
-//         }
-//     }
-// }

package.json

@@ -2,6 +2,7 @@
   "dependencies": {
     "base-64": "^1.0.0",
     "crypto-js": "^4.1.1",
+    "facebook-sdk": "^0.3.3",
     "vuex": "^4.0.2"
   }
 }

pages/account/index.vue

@@ -554,9 +554,9 @@
 			display: flex;
 			justify-content: center;
 			align-items: center;
-			position: absolute;
+			// position: absolute;
 			width: 100%;
-			top: 13.5%;
+			top: 11%;
 			// left: 15%;
 
 				// z-index: 1111;
@@ -574,7 +574,7 @@
 				color: #F7F7F7;
 				margin-bottom: 57px;
 				position: absolute;
-				padding: 150px 50px 0;
+				padding: 110px 50px 0;
 			}
 		}
 

pages/index/index.vue

@@ -578,6 +578,12 @@
 									// console.log(this.Swiper_H)
 								})
 							}
+							if (item.zone_code == 'HOMEAD') {
+								item.blocks.map(item1 => {
+									this.getimgheight(item1.block_pic)
+									// console.log(this.Swiper_H)
+								})
+							}
 							if (item.zone_code == 'BANNER1') {
 								item.blocks.map(item1 => {
 									this.getimgheight2(item1.block_pic)
@@ -1150,7 +1156,7 @@
 			},
 			//轮播图跳转 // 热卖跳转
 			imgTo(item) {
-				//console.log(item,'item')
+				console.log(item,'item')
 				////console.log(item.block_link.includes('dope.youhui'))
 				let goodid
 				
@@ -1277,6 +1283,7 @@
 						</swiper-item>
 					</swiper>
 				</view>
+				
 				<!-- 宫格 -->
 				<uni-swiper-dot :info="info" :current="current" field="content" mode="default"
 					v-if="item.zone_code=='ICON' && item.zone_status=='NORMAL' && item.zone_code!=indexDate.zones[index-1].zone_code">
@@ -1295,6 +1302,7 @@
 						</swiper-item>
 					</swiper>
 				</uni-swiper-dot>
+				
 				<!-- ONEPIC -->
 				<view class="ONEPIC" v-if="item.zone_code=='ONEPIC' && item.zone_status=='NORMAL'">
 					<!-- class="discount page_padding" -->
@@ -1315,6 +1323,11 @@
 						</swiper-item>
 					</swiper>
 				</view>
+			<!-- HOMEAD -->
+			<view class="HOMEAD" v-if="item.zone_code=='HOMEAD' && item.zone_status=='NORMAL'">
+				<image :src="item.blocks[0].block_pic":style="{height:(item.zone_code=='HOMEAD')?item.zone_column+'rpx':''}" mode=""
+					@click="imgTo(item.blocks[0])"></image>
+			 </view>
 				<!-- TWOPIC -->
 				<view class="TWOPIC" v-if="item.zone_code=='TWOPIC' && item.zone_status=='NORMAL'">
 					<image :src="item1.block_pic" :style="{height:(item.zone_code=='TWOPIC')?item.zone_column+'rpx':''}"
@@ -1345,6 +1358,7 @@
 						mode="" @click="imgTo(item1)" v-for="(item1,index1) in item.blocks" :key="item1.block_id">
 					</image>
 				</view>
+				
 				<!-- 标题 -->
 				<navigator url="/pages/index/flashSale" v-if="item.zone_code=='SPIKE1' && item.zone_status=='NORMAL'">
 					<view class="index_title page_padding">
@@ -1409,6 +1423,7 @@
 					<image src="../../static/img/right.png" mode=""></image>
 				</view>
 			</view> -->
+		
 				<!-- HOT SELLS 2 -->
 				<scroll-view class="spike1 page_padding" scroll-x="true" @change="handlechange" :show-scrollbar="false"
 					:indicator-dots="true" :circular="true" :interval="3000" :duration="1000"
@@ -1520,6 +1535,7 @@
 			</custom-waterfalls-flow>
 		</view>
 		 -->
+		 
 			<view class="container" v-if="bestlist.length>0">
 				<view class="left">
 					<view v-for="(item,index) in leftList" :key="index">
@@ -1965,10 +1981,12 @@
 	.navigation_scroll {
 		// margin-top: -80rpx;
 		// padding-top: 10rpx;
-		padding-top: 15px;
 		// margin: 20rpx 0 !important;
 		// position: fixed;
-		padding-bottom: 10rpx;
+		padding-top: 8px;
+		padding-bottom: 0px;
+		// padding-top: 15px;
+		// padding-bottom: 10rpx;
 		background-color: #000;
 		z-index: 99;
 		background: rgba(0, 0, 0, 0.7) !important;

pages/index/index2.vue

@@ -87,7 +87,6 @@
 			</view>
 
 
-
 			<!-- 标题 -->
 			<navigator url="/pages/index/flashSale" v-if="item.zone_code=='SPIKE1' && item.zone_status=='NORMAL'">
 				<view class="index_title page_padding">
@@ -592,12 +591,15 @@
 				console.log(item.block_link)
 				if (goodid.includes('goodslist')) {
 					uni.navigateTo({
-						url: '../category/productList' + goodid
+						url: 'http://localhost:8080/#/pages/index/pickUpCentre'
+						// url: '../category/productList' + goodid
 					})
+					console.log(11111)
 				} else {
 					uni.navigateTo({
 						url: '../productDetails/index' + goodid + '&img=1'
 					})
+					console.log(22222)
 				}
 
 			},

pages/order/confirmation.vue

@@ -62,7 +62,7 @@
 				<text>Coupons</text>
 				<view class="discount_item_right">
 					<text v-if="bonus>0 ||bonus!=0">-US${{bonus}}</text>
-					<text v-if="isusebonus == 0">No available</text>
+					<!-- <text v-if="isusebonus == 0">No available</text> -->
 					<image src="../../static/img/right.png" mode="" class="address_more"></image>
 				</view>
 			</view>
@@ -94,7 +94,7 @@
 		</view>
 
 		<view class="total">
-			<text>Total: US${{total.amount}}</text>
+			<text>Total: US${{total.amount - bonus}}</text>
 			<button @click="place()">PLACE ORDER</button>
 		</view>
 
@@ -218,7 +218,7 @@
 								<image src="../../static/icon/true.png"
 									@click="current=-1,bonus=0,total.bonus = 0,useCoupons(index,item)"></image>
 							</view>
-							<button @click="gotoindex()" v-if="item.use==true">Use Now</button>
+							<button @click="gotoindex()" v-if="item.use==false">Use Now</button>
 						</view>
 					</view>
 				</view>
@@ -364,16 +364,19 @@
 			},
 				// 使用红包
 				useCoupons(index, item) {
-				// this.current = index
+					// this.current = -1
 					let total = uni.getStorageSync('total')
-				////console.log(this.current)
+					console.log(this.current)
 					// this.bouns_id = item.bonus_id
-				//////console.log(total)
+					console.log(total)
 
 					if (this.current == index) {
 						this.bonus = item.type_money
-					//////console.log(this.bonus)
+						console.log(this.bonus)
+						console.log(item.type_money)
+						console.log(this.total.bonus)
 						this.total.bonus = item.type_money
+						console.log(this.total.bonus)
 						let id = item.bonus_id
 						this.bouns_id = item.bonus_id
 						let data = {
@@ -396,9 +399,8 @@
 
 						// 	}
 						// })
-
-					this.total.amount = (parseFloat(total.amount) - parseFloat(this.bonus)).toFixed(2) - (parseFloat(this
-						.Points).toFixed(2))
+						this.total.amount = (parseFloat(total.amount)  - parseFloat(this.Points)).toFixed(2)
+						// this.total.amount = (parseFloat(total.amount) - parseFloat(this.bonus)).toFixed(2) - (parseFloat(this.Points).toFixed(2))
 						console.log(this.total.amount)
 
 					} else {
@@ -408,6 +410,8 @@
 					}
 					// this.isCoupons = false
 				},
+			
+
 			gotoindex() {
 				uni.switchTab({
 					url: '../index/index'
@@ -494,7 +498,6 @@
 			},
 			Thepoint() {
 				//使用余额 使用红包
-
 				if (this.use && (this.current != -1 || this.bonus != 0)) {
 					this.total.bonus = this.bonus
 					this.total = uni.getStorageSync('total')
@@ -615,7 +618,7 @@
 
 						if (e == 2) {
 							this.shipping_list = res.data.shipping_list
-							console.info(res.data.shipping_list)
+							console.info(res.data.shipping_list + "=======================")
 							this.orderId = this.shipping_list[0].shipping_id
 						}
 
@@ -640,6 +643,7 @@
 					////////console.info(res)
 					if (res.error == 0) {
 						this.list = res.data
+						
 						////console.log(this.list[0].type_money)
 						// this.bonus = this.list[0].type_money
 						// console.log(this.total.amount)
@@ -683,6 +687,7 @@
 						// uni.setStorageSync('totalsum',sum)
 
 						console.log(this.list)
+						// this.current = this.list.length
 					}
 				})
 				//获取余额
@@ -781,7 +786,7 @@
 				})
 				s++;
 			}, 1000);
-			// this.current = 0
+			// this.current = this.list.length
 			this.query = JSON.parse(e.query)
 			console.log(this.query)
 			this.getList(this.query, 1)

pages/productDetails/index.vue

@@ -397,7 +397,7 @@
 							:class="goods_attr_list[index].goods_attr_id==item1.goods_attr_id?'active_color':''"
 							@click="selectAttr(item.attr_id,item1.goods_attr_id,index1,item1.attr_price)">
 							<view class="color_select_item_zoom">
-								<image src="/static/icon/big2.png" @click="clickImg(index1)" mode=""
+								<image src="/static/icon/big2.png" @click="clickImg(index1,item.list)" mode=""
 									v-if="item1.attr_img!=''"></image>
 							</view>
 							<image :src="item1.attr_img" mode="" v-if="item1.attr_img!=''"></image>
@@ -761,7 +761,7 @@
 					})
 				} else {
 					wx.previewImage({
-						urls: this.info, //需要预览的图片http链接列表，多张的时候，url直接写在后面就行了
+						urls: this.goods_attr_list, //需要预览的图片http链接列表，多张的时候，url直接写在后面就行了
 						current: index, // 当前显示图片的http链接，默认是第一个
 						indicator: 'number',
 						success: function(res) {},
@@ -771,6 +771,7 @@
 				}
 
 			},
+			
 			// 其他商品详情
 			goDetails(id) {
 				uni.navigateTo({