ltlzx
/
cnic_buyer
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

1

master
zhengshuiqi 4 years ago
parent
324543f451
commit
0e5e19329c
9 changed files with 4325 additions and 116 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 58
      ios/index.js
  2. 4240
      package-lock.json
  3. 1
      package.json
  4. 6
      pages/account/index.vue
  5. 24
      pages/index/index.vue
  6. 6
      pages/index/index2.vue
  7. 101
      pages/order/confirmation.vue
  8. 5
      pages/productDetails/index.vue
  9. BIN
      static/img/dope plus_white.png

58
ios/index.js
View File

@ -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);
// }
// }
// }

4240
package-lock.json
View File

File diff suppressed because it is too large

1
package.json
View File

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

6
pages/account/index.vue
View File

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

24
pages/index/index.vue
View File

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

6
pages/index/index2.vue
View File

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

101
pages/order/confirmation.vue
View File

@ -62,7 +62,7 @@
<text>Coupons</text> <text>Coupons</text>
<view class="discount_item_right"> <view class="discount_item_right">
<text v-if="bonus>0 ||bonus!=0">-US${{bonus}}</text> <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> <image src="../../static/img/right.png" mode="" class="address_more"></image>
</view> </view>
</view> </view>
@ -94,7 +94,7 @@
</view> </view>
<view class="total"> <view class="total">
<text>Total: US${{total.amount}}</text> <text>Total: US${{total.amount - bonus}}</text>
<button @click="place()">PLACE ORDER</button> <button @click="place()">PLACE ORDER</button>
</view> </view>
@ -214,11 +214,11 @@
<image src="../../static/icon/flase.png" @click="current=index,useCoupons(index,item)"> <image src="../../static/icon/flase.png" @click="current=index,useCoupons(index,item)">
</image> </image>
</view> </view>
<view class="select_cop" v-show="current==index|| bonus == item.type_money"> <view class="select_cop" v-show="current== index|| bonus == item.type_money">
<image src="../../static/icon/true.png" <image src="../../static/icon/true.png"
@click="current=-1,bonus=0,total.bonus = 0,useCoupons(index,item)"></image> @click="current=-1,bonus=0,total.bonus = 0,useCoupons(index,item)"></image>
</view> </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> </view>
</view> </view>
@ -362,52 +362,56 @@
} }
}, },
// 使用红包 // 使用红包
useCoupons(index, item) { useCoupons(index, item) {
// this.current = index // this.current = -1
let total = uni.getStorageSync('total') let total = uni.getStorageSync('total')
////console.log(this.current) console.log(this.current)
// this.bouns_id = item.bonus_id // this.bouns_id = item.bonus_id
//////console.log(total) console.log(total)
if (this.current == index) { if (this.current == index) {
this.bonus = item.type_money this.bonus = item.type_money
//////console.log(this.bonus) console.log(this.bonus)
this.total.bonus = item.type_money console.log(item.type_money)
let id = item.bonus_id console.log(this.total.bonus)
this.bouns_id = item.bonus_id this.total.bonus = item.type_money
let data = { console.log(this.total.bonus)
_action: 'cartselectbonus', let id = item.bonus_id
bonus: id, this.bouns_id = item.bonus_id
consignee: this.address let data = {
} _action: 'cartselectbonus',
////console.log(data) bonus: id,
// defaultRequest3(data,'consignee').then(res=>{ consignee: this.address
// if(res.error==0){ }
////console.log(data)
// defaultRequest3(data,'consignee').then(res=>{
// if(res.error==0){
// this.total=res.data.total // this.total=res.data.total
// ////console.log(this.total.bonus) // ////console.log(this.total.bonus)
// uni.setStorageSync('Total',this.total) // uni.setStorageSync('Total',this.total)
// this.order=res.data.order // this.order=res.data.order
// //使用了余额 // //使用了余额
// this.usemethod() // this.usemethod()
// // this.Thepoint() // // this.Thepoint()
// } // }
// }) // })
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)
this.total.amount = (parseFloat(total.amount) - parseFloat(this.bonus)).toFixed(2) - (parseFloat(this } else {
.Points).toFixed(2)) this.bonus = 0
console.log(this.total.amount) this.total = uni.getStorageSync('total')
// this.Thepoint()
}
// this.isCoupons = false
},
} else {
this.bonus = 0
this.total = uni.getStorageSync('total')
// this.Thepoint()
}
// this.isCoupons = false
},
gotoindex() { gotoindex() {
uni.switchTab({ uni.switchTab({
url: '../index/index' url: '../index/index'
@ -494,7 +498,6 @@
}, },
Thepoint() { Thepoint() {
//使用余额 使用红包 //使用余额 使用红包
if (this.use && (this.current != -1 || this.bonus != 0)) { if (this.use && (this.current != -1 || this.bonus != 0)) {
this.total.bonus = this.bonus this.total.bonus = this.bonus
this.total = uni.getStorageSync('total') this.total = uni.getStorageSync('total')
@ -615,7 +618,7 @@
if (e == 2) { if (e == 2) {
this.shipping_list = res.data.shipping_list 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 this.orderId = this.shipping_list[0].shipping_id
} }
@ -640,6 +643,7 @@
////////console.info(res) ////////console.info(res)
if (res.error == 0) { if (res.error == 0) {
this.list = res.data this.list = res.data
////console.log(this.list[0].type_money) ////console.log(this.list[0].type_money)
// this.bonus = this.list[0].type_money // this.bonus = this.list[0].type_money
// console.log(this.total.amount) // console.log(this.total.amount)
@ -683,6 +687,7 @@
// uni.setStorageSync('totalsum',sum) // uni.setStorageSync('totalsum',sum)
console.log(this.list) console.log(this.list)
// this.current = this.list.length
} }
}) })
//获取余额 //获取余额
@ -781,7 +786,7 @@
}) })
s++; s++;
}, 1000); }, 1000);
// this.current = 0 // this.current = this.list.length
this.query = JSON.parse(e.query) this.query = JSON.parse(e.query)
console.log(this.query) console.log(this.query)
this.getList(this.query, 1) this.getList(this.query, 1)

5
pages/productDetails/index.vue
View File

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

BIN
static/img/dope plus_white.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 17 KiB

After

Width:  |  Height:  |  Size: 6.5 KiB

Write Preview
Loading…
Cancel
Save