wangmingchuan
/
yanzong_qianduan
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'main' of http://git.njrzwl.cn:3000/wangmingchuan/yanzong_qianduan

Browse Source
dev
liudan 1 year ago
parent e9e90596a8 9d24b16942
commit e88d097b82
16 changed files with 639 additions and 276 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 9
      api/goods/index.js
  2. 8
      api/home/index.js
  3. 20
      api/preList/index.js
  4. 8
      pages/activity/newGoods.vue
  5. 40
      pages/activity/newsshop.vue
  6. 11
      pages/category/index.vue
  7. 53
      pages/goods/components/SkuPopup.vue
  8. 269
      pages/goods/detail.vue
  9. 177
      pages/index/index.vue
  10. 2
      pages/news/article/classify.vue
  11. 15
      pages/news/coupon/list.vue
  12. 2
      pages/news/park/recordHistory.vue
  13. 34
      pages/news/rules/rulesList.vue
  14. 5
      pages/search/index.vue
  15. 255
      pages/sureOrder/index.vue
  16. 7
      pages/user/index.vue

9
api/goods/index.js
Unescape View File

@ -10,7 +10,8 @@ const api = {
skuInfo: 'goods/skuInfo', skuInfo: 'goods/skuInfo',
recommended: 'goods/recommended', recommended: 'goods/recommended',
poster: 'goods/poster', poster: 'goods/poster',
serveList:'goods.service/list' serveList:'goods.service/list',
presale:'goods/presale'
} }
// 商品浏览记录 // 商品浏览记录
@ -36,7 +37,11 @@ export const presale = (data) => {
return request.get('goods/presale', data) return request.get('goods/presale', data)
} }
// 商品浏览记录 // // 商品浏览记录
// export const presale = (param, option) => {
// return request.get(api.presale, param, option)
// }
// 服务
export const serveList = (param, option) => { export const serveList = (param, option) => {
return request.get(api.serveList, param, option) return request.get(api.serveList, param, option)
} }

8
api/home/index.js
Unescape View File

@ -5,14 +5,18 @@ const api = {
list: 'goods/list', list: 'goods/list',
chartsGoodsJing:'goods/chartsGoodsJing', chartsGoodsJing:'goods/chartsGoodsJing',
brandList:'goods/brandList', brandList:'goods/brandList',
typeList:'category/list' typeList:'category/list',
cityInfo:'goods/cityInfo'
} }
// 商品列表
export const cityInfo = (param, option) => {
return request.get(api.cityInfo, param, option)
}
// 商品列表 // 商品列表
export const list = (param, option) => { export const list = (param, option) => {
return request.get(api.list, param, option) return request.get(api.list, param, option)
} }
// 首页排行榜 // 首页排行榜
export const chartsGoodsJing = (param, option) => { export const chartsGoodsJing = (param, option) => {
return request.get(api.chartsGoodsJing, param, option) return request.get(api.chartsGoodsJing, param, option)

20
api/preList/index.js
Unescape View File

@ -0,0 +1,20 @@
import request from '@/utils/request'
// api地址
const api = {
list: 'goods/presaleList',
canlpresale: 'goods/canlpresale'
}
/**
* 获取支付订单的信息
* @param {Number} orderId
* @param {Object} param
*/
export function list(param) {
return request.get(api.list, param)
}
export function canlpresale(param) {
return request.get(api.canlpresale, param)
}

8
pages/activity/newGoods.vue
Unescape View File

@ -308,15 +308,15 @@
position: absolute; position: absolute;
top: -68rpx; top: -68rpx;
right: 0; right: 20rpx;
} }
} }
.price { .price {
display: flex; display: flex;
justify-content: flex-end; justify-content: flex-end;
margin-top: 14rpx; margin-top: 50rpx;
margin-right: 30rpx;
.lowPrice { .lowPrice {
height: 50rpx; height: 50rpx;
font-size: 36rpx; font-size: 36rpx;
@ -324,7 +324,7 @@
font-weight: 600; font-weight: 600;
color: #DE041C; color: #DE041C;
line-height: 50rpx; line-height: 50rpx;
margin-right: 30rpx; margin-right: 20rpx;
} }
.buyNow { .buyNow {

40
pages/activity/newsshop.vue
Unescape View File

@ -8,26 +8,26 @@
<view class="newsshop-bd"> <view class="newsshop-bd">
<view class="newsshop-sale"> <view class="newsshop-sale">
<view class="a"> <view class="a">
<image src="@/static/news/newshop-03.png"></image> <image src="https://www.saas.njrenzhou.com/static/news/newshop-03.png"></image>
</view> </view>
<view class="info"> <view class="info">
<scroll-view scroll-x class="b"> <scroll-view scroll-x class="b">
<view class="li"> <view class="li">
<view class="item" v-for="i in 12" :key="i"> <view class="item" v-for="i in 12" :key="i">
<image class="pic" src="@/static/home/phone.jpg"></image> <image class="pic" src="https://www.saas.njrenzhou.com/static/home/phone.jpg"></image>
<view class="title">iphone 15pro</view> <view class="title">iphone 15pro</view>
<view class="price"> <view class="price">
<image class="icon" src="@/static/news/newshop-05.png"></image> <image class="icon" src="https://www.saas.njrenzhou.com/static/news/newshop-05.png"></image>
<view class="p">￥<text>23999</text></view> <view class="p">￥<text>23999</text></view>
</view> </view>
</view> </view>
</view> </view>
<view class="li"> <view class="li">
<view class="item" v-for="i in 12" :key="i"> <view class="item" v-for="i in 12" :key="i">
<image class="pic" src="@/static/home/phone.jpg"></image> <image class="pic" src="https://www.saas.njrenzhou.com/static/home/phone.jpg"></image>
<view class="title">iphone 15pro</view> <view class="title">iphone 15pro</view>
<view class="price"> <view class="price">
<image class="icon" src="@/static/news/newshop-05.png"></image> <image class="icon" src="https://www.saas.njrenzhou.com/static/news/newshop-05.png"></image>
<view class="p">￥<text>23999</text></view> <view class="p">￥<text>23999</text></view>
</view> </view>
</view> </view>
@ -40,7 +40,7 @@
</view> </view>
<view class="newsshop-hot"> <view class="newsshop-hot">
<view class="a"> <view class="a">
<image src="@/static/news/newshop-04.png"></image> <image src="https://www.saas.njrenzhou.com/static/news/newshop-04.png"></image>
</view> </view>
<view class="info"> <view class="info">
<view class="d"> <view class="d">
@ -50,10 +50,10 @@
<scroll-view scroll-x class="b"> <scroll-view scroll-x class="b">
<view class="li"> <view class="li">
<view class="item" v-for="i in 24" :key="i"> <view class="item" v-for="i in 24" :key="i">
<image class="pic" src="@/static/home/phone.jpg"></image> <image class="pic" src="https://www.saas.njrenzhou.com/static/home/phone.jpg"></image>
<view class="title">iphone 15pro</view> <view class="title">iphone 15pro</view>
<view class="price"> <view class="price">
<image class="icon" src="@/static/news/newshop-06.png"></image> <image class="icon" src="https://www.saas.njrenzhou.com/static/news/newshop-06.png"></image>
<view class="p">￥<text>23999</text></view> <view class="p">￥<text>23999</text></view>
<view class="o">160</view> <view class="o">160</view>
</view> </view>
@ -61,10 +61,10 @@
</view> </view>
<view class="li"> <view class="li">
<view class="item" v-for="i in 24" :key="i"> <view class="item" v-for="i in 24" :key="i">
<image class="pic" src="@/static/home/phone.jpg"></image> <image class="pic" src="https://www.saas.njrenzhou.com/static/home/phone.jpg"></image>
<view class="title">iphone 15pro</view> <view class="title">iphone 15pro</view>
<view class="price"> <view class="price">
<image class="icon" src="@/static/news/newshop-06.png"></image> <image class="icon" src="https://www.saas.njrenzhou.com/static/news/newshop-06.png"></image>
<view class="p">￥<text>23999</text></view> <view class="p">￥<text>23999</text></view>
<view class="o">160</view> <view class="o">160</view>
</view> </view>
@ -80,7 +80,7 @@
<scroll-view scroll-x class="b"> <scroll-view scroll-x class="b">
<view class="li"> <view class="li">
<view class="item" v-for="i in 16" :key="i"> <view class="item" v-for="i in 16" :key="i">
<image class="pic" src="@/static/home/phone.jpg"></image> <image class="pic" src="https://www.saas.njrenzhou.com/static/home/phone.jpg"></image>
<view class="title">iphone 15pro</view> <view class="title">iphone 15pro</view>
<view class="price"> <view class="price">
￥<text>23999</text> ￥<text>23999</text>
@ -89,7 +89,7 @@
</view> </view>
<view class="li"> <view class="li">
<view class="item" v-for="i in 16" :key="i"> <view class="item" v-for="i in 16" :key="i">
<image class="pic" src="@/static/home/phone.jpg"></image> <image class="pic" src="https://www.saas.njrenzhou.com/static/home/phone.jpg"></image>
<view class="title">iphone 15pro</view> <view class="title">iphone 15pro</view>
<view class="price"> <view class="price">
￥<text>23999</text> ￥<text>23999</text>
@ -98,7 +98,7 @@
</view> </view>
<view class="li"> <view class="li">
<view class="item" v-for="i in 16" :key="i"> <view class="item" v-for="i in 16" :key="i">
<image class="pic" src="@/static/home/phone.jpg"></image> <image class="pic" src="https://www.saas.njrenzhou.com/static/home/phone.jpg"></image>
<view class="title">iphone 15pro</view> <view class="title">iphone 15pro</view>
<view class="price"> <view class="price">
￥<text>23999</text> ￥<text>23999</text>
@ -107,7 +107,7 @@
</view> </view>
<view class="li"> <view class="li">
<view class="item" v-for="i in 16" :key="i"> <view class="item" v-for="i in 16" :key="i">
<image class="pic" src="@/static/home/phone.jpg"></image> <image class="pic" src="https://www.saas.njrenzhou.com/static/home/phone.jpg"></image>
<view class="title">iphone 15pro</view> <view class="title">iphone 15pro</view>
<view class="price"> <view class="price">
￥<text>23999</text> ￥<text>23999</text>
@ -124,7 +124,7 @@
<scroll-view scroll-x class="b"> <scroll-view scroll-x class="b">
<view class="li"> <view class="li">
<view class="item" v-for="i in 16" :key="i"> <view class="item" v-for="i in 16" :key="i">
<image class="pic" src="@/static/home/phone.jpg"></image> <image class="pic" src="https://www.saas.njrenzhou.com/static/home/phone.jpg"></image>
<view class="title">iphone 15pro</view> <view class="title">iphone 15pro</view>
<view class="price"> <view class="price">
￥<text>23999</text> ￥<text>23999</text>
@ -133,7 +133,7 @@
</view> </view>
<view class="li"> <view class="li">
<view class="item" v-for="i in 16" :key="i"> <view class="item" v-for="i in 16" :key="i">
<image class="pic" src="@/static/home/phone.jpg"></image> <image class="pic" src="https://www.saas.njrenzhou.com/static/home/phone.jpg"></image>
<view class="title">iphone 15pro</view> <view class="title">iphone 15pro</view>
<view class="price"> <view class="price">
￥<text>23999</text> ￥<text>23999</text>
@ -142,7 +142,7 @@
</view> </view>
<view class="li"> <view class="li">
<view class="item" v-for="i in 16" :key="i"> <view class="item" v-for="i in 16" :key="i">
<image class="pic" src="@/static/home/phone.jpg"></image> <image class="pic" src="https://www.saas.njrenzhou.com/static/home/phone.jpg"></image>
<view class="title">iphone 15pro</view> <view class="title">iphone 15pro</view>
<view class="price"> <view class="price">
￥<text>23999</text> ￥<text>23999</text>
@ -151,7 +151,7 @@
</view> </view>
<view class="li"> <view class="li">
<view class="item" v-for="i in 16" :key="i"> <view class="item" v-for="i in 16" :key="i">
<image class="pic" src="@/static/home/phone.jpg"></image> <image class="pic" src="https://www.saas.njrenzhou.com/static/home/phone.jpg"></image>
<view class="title">iphone 15pro</view> <view class="title">iphone 15pro</view>
<view class="price"> <view class="price">
￥<text>23999</text> ￥<text>23999</text>
@ -447,7 +447,7 @@
overflow: hidden; overflow: hidden;
border-radius: 10rpx; border-radius: 10rpx;
padding-bottom: 30rpx; padding-bottom: 30rpx;
background: #fff url(@/static/news/newshop-01.png) center top no-repeat; background: #fff url(https://www.saas.njrenzhou.com/static/news/newshop-01.png) center top no-repeat;
background-size: 100% auto; background-size: 100% auto;
.a { .a {
@ -524,7 +524,7 @@
overflow: hidden; overflow: hidden;
border-radius: 10rpx; border-radius: 10rpx;
padding-bottom: 30rpx; padding-bottom: 30rpx;
background: #fff url(@/static/news/newshop-02.png) center top no-repeat; background: #fff url(https://www.saas.njrenzhou.com/static/news/newshop-02.png) center top no-repeat;
background-size: 100% auto; background-size: 100% auto;
.a { .a {

11
pages/category/index.vue
Unescape View File

@ -26,10 +26,10 @@
热门分类 热门分类
</view> </view>
<view class="goodsList"> <view class="goodsList">
<view class="listItem" v-for="(item,index) in hotList" :key="index"> <view class="listItem" v-for="(item,index) in hotList" :key="index" @click="choseSecondMenu(item)">
<image src="/static/home/goodsDemo.png" mode="" class="goodsImg"></image> <image :src="item.image.preview_url" mode="" class="goodsImg" v-if="item.image.preview_url"></image>
<view class="goodsName"> <view class="goodsName">
TCL {{item.name}}
</view> </view>
</view> </view>
</view> </view>
@ -60,7 +60,7 @@
return { return {
secondChose:'', secondChose:'',
menuList: [], menuList: [],
typeName: '空调', typeName: '',
goodsList: [], goodsList: [],
isChose: '', isChose: '',
hotList: [], hotList: [],
@ -76,11 +76,14 @@
this.isChose = item.category_id; this.isChose = item.category_id;
this.secondMenu = item.children; this.secondMenu = item.children;
this.secondChose='' this.secondChose=''
this.hotList = item.children
// this.secondChose = this.secondMenu[0].category_id; // this.secondChose = this.secondMenu[0].category_id;
this.getSonList(this.isChose) this.getSonList(this.isChose)
}, },
choseSecondMenu(item){ choseSecondMenu(item){
this.secondChose = item.category_id; this.secondChose = item.category_id;
this.typeName = item.name
this.getSonList(this.secondChose) this.getSonList(this.secondChose)
}, },
getGoodsTypeList() { getGoodsTypeList() {

53
pages/goods/components/SkuPopup.vue
Unescape View File

@ -73,19 +73,22 @@
const app = this const app = this
const { goods: { goods_name, goods_image, skuList } } = app const { goods: { goods_name, goods_image, skuList } } = app
const skuData = [] const skuData = []
skuList.forEach(item => { if(skuList && skuList.length > 0){
skuData.push({ skuList.forEach(item => {
_id: item.id, skuData.push({
goods_sku_id: item.goods_sku_id, _id: item.id,
goods_id: item.goods_id, goods_sku_id: item.goods_sku_id,
goods_name: goods_name, goods_id: item.goods_id,
image: item.image_url ? item.image_url : goods_image, goods_name: goods_name,
price: item.goods_price * 100, image: item.image_url ? item.image_url : goods_image,
stock: item.stock_num, price: item.goods_price * 100,
spec_value_ids: item.spec_value_ids, stock: item.stock_num,
sku_name_arr: app.getSkuNameArr(item.spec_value_ids) spec_value_ids: item.spec_value_ids,
}) sku_name_arr: app.getSkuNameArr(item.spec_value_ids)
}) })
})
}
return skuData return skuData
}, },
@ -118,16 +121,18 @@
const { goods: { specList } } = this const { goods: { specList } } = this
const defaultData = [{ name: '默认', list: [{ name: '默认' }] }] const defaultData = [{ name: '默认', list: [{ name: '默认' }] }]
const specData = [] const specData = []
specList.forEach(group => { if(specList && specList.length > 0){
const children = [] specList.forEach(group => {
group.valueList.forEach(specValue => { const children = []
children.push({ name: specValue.spec_value }) group.valueList.forEach(specValue => {
}) children.push({ name: specValue.spec_value })
specData.push({ })
name: group.spec_name, specData.push({
list: children name: group.spec_name,
}) list: children
}) })
})
}
return specData.length ? specData : defaultData return specData.length ? specData : defaultData
}, },
@ -168,7 +173,7 @@
// 立即购买 // 立即购买
buyNow(selectShop) { buyNow(selectShop) {
// 跳转到订单结算页 // 跳转到订单结算页
this.$navTo('pages/checkout/index', { this.$navTo('pages/sureOrder/index', {
mode: 'buyNow', mode: 'buyNow',
goodsId: selectShop.goods_id, goodsId: selectShop.goods_id,
goodsSkuId: selectShop.goods_sku_id, goodsSkuId: selectShop.goods_sku_id,

269
pages/goods/detail.vue
Unescape View File

@ -3,14 +3,15 @@
<u-navbar> <u-navbar>
<view class="slot-wrap"> <view class="slot-wrap">
<input type="text" placeholder="iPhone15" class="searInput" /> <input type="text" @click="toSearch()" disabled placeholder="iPhone15" class="searInput" />
</view> </view>
</u-navbar> </u-navbar>
<view class="head"> <view class="head">
<view class="share"> <view class="share">
<view class="sp"></view> <view class="sp"></view>
<image src="/static/detail/share.png" mode="" class="shareIcon"></image> <button open-type="share"></button>
<image src="/static/detail/share.png" mode="" class="shareIcon" @click="shareImg"></image>
</view> </view>
<view class="swiper"> <view class="swiper">
<swiper class="swiper" circular :indicator-dots="indicatorDots" :autoplay="autoplay" <swiper class="swiper" circular :indicator-dots="indicatorDots" :autoplay="autoplay"
@ -42,17 +43,18 @@
</view> </view>
</view> </view>
</view> </view>
<view class="pro" @click="goMember" v-if="userInfo.user_type==10"> <!-- v-if="userInfo.user_type==10" -->
<view class="pro">
<view class="proMem"> <view class="proMem">
<text v-if="userInfo.user_type==10">Plus</text> <text v-if="userInfo.user_type==10">Plus</text>
<text v-if="userInfo.user_type==20">分销</text> <text v-if="userInfo.user_type==20">分销</text>
会员 PRO会员
</view> </view>
<view class="proInfo"> <view class="proInfo">
开通<text v-if="userInfo.user_type==10">Plus</text> 开通<text v-if="userInfo.user_type==10">Plus</text>
<text v-if="userInfo.user_type==20">分销</text>会员 预计再省 <text v-if="userInfo.user_type==20">分销</text>会员预计再省
</view> </view>
<view class="proBtn"> <view class="proBtn" @click="goMember">
立即开通 立即开通
</view> </view>
</view> </view>
@ -61,7 +63,7 @@
{{goods.goods_name}} {{goods.goods_name}}
</view> </view>
<view class="goodsOpera"> <view class="goodsOpera">
<view class="goodsNum" @click="copyNum"> <view class="goodsNum" @click="copyNum" v-if="goods.skuList.length>0">
<text>{{goods.skuList[0].goods_sku_id}}</text> <text>{{goods.skuList[0].goods_sku_id}}</text>
<image src="/static/detail/copy.png" mode=""></image> <image src="/static/detail/copy.png" mode=""></image>
</view> </view>
@ -90,7 +92,7 @@
<image src="../../static/detail/rightIcon.png" mode=""></image> <image src="../../static/detail/rightIcon.png" mode=""></image>
</view> </view>
<view class="address"> <view class="address">
{{}} {{addressInfo.region.province +'-'+addressInfo.region.city+'-'+addressInfo.region.region}}
</view> </view>
</view> </view>
</view> </view>
@ -107,15 +109,12 @@
<view class="busSour"> <view class="busSour">
<text>商家来源：平台认证商户</text> <text>商家来源：平台认证商户</text>
</view> </view>
<!-- <view class="busName">
<text>商家名称：北京伊莫电子科技有限公司</text>
</view> -->
</view> </view>
</view> </view>
<view class="chosed"> <view class="chosed" v-if="serveList.length>0">
<view class="title">服务</view> <view class="title">服务</view>
<image src="/static/detail/buy.png" mode="" class="buy"></image> <!-- <image src="/static/detail/buy.png" mode="" class="buy"></image> -->
<view class="info">枪色 1件</view> <view class="info" v-for="(item,index) in serveList" :key="index">{{item.name}}</view>
</view> </view>
</view> </view>
<view class="about"> <view class="about">
@ -123,12 +122,12 @@
<view class="aboutSuggest"> <view class="aboutSuggest">
相关推荐 相关推荐
</view> </view>
<view class="more"> <!-- <view class="more">
查看更多 查看更多
</view> </view> -->
</view> </view>
<view class="goodsList"> <view class="goodsList">
<view class="goodsItem" v-for="(item,index) in suggestGoodsList" :key="index"> <view class="goodsItem" v-for="(item,index) in suggestGoodsList" :key="index" @click="toDetail(item.goods_id)">
<view class="img"> <view class="img">
<image :src="item.goods_image" mode="" class="goodsImg"></image> <image :src="item.goods_image" mode="" class="goodsImg"></image>
</view> </view>
@ -141,9 +140,7 @@
</view> </view>
</view> </view>
</view> </view>
<view class="vacancy"> <view class="detail-content" v-html="goods.content"></view>
</view>
<view class="footer"> <view class="footer">
<view class="fooLeft"> <view class="fooLeft">
<view class="footerCus firstBtn"> <view class="footerCus firstBtn">
@ -153,6 +150,7 @@
<view class="customer"> <view class="customer">
客服 客服
</view> </view>
<button open-type="contact"></button>
</view> </view>
<view class="footerCus " @click="shoppingCart"> <view class="footerCus " @click="shoppingCart">
<view class="cusIcon"> <view class="cusIcon">
@ -178,7 +176,7 @@
</view> </view>
<view class="dia" v-if="openDialog"> <view class="dia" v-if="openDialog">
<view class="preSuc" v-if="diaShow"> <view class="preSuc" v-if="shareType=='pre'">
<view class="preImg"> <view class="preImg">
<image src="../../static/order/ld.png" mode="" class="ldImg"></image> <image src="../../static/order/ld.png" mode="" class="ldImg"></image>
</view> </view>
@ -189,7 +187,7 @@
查看预约记录 查看预约记录
</view> </view>
</view> </view>
<view class="setMs" v-if="setPrice"> <view class="setMs" v-if="shareType=='setPrice'">
<view class="msprice"> <view class="msprice">
设置秒杀价格 设置秒杀价格
</view> </view>
@ -232,33 +230,33 @@
</view> </view>
</view> </view>
</view> </view>
<view class="shareWechat" v-if="goodShow"> <view class="shareWechat" v-if="shareType=='share'">
<view class="shareGoods"> <view class="shareGoods">
<image src="/static/detail/tv.png" mode="" class="shareImg"></image> <image src="/static/detail/tv.png" mode="" class="shareImg"></image>
</view> </view>
<view class="shareInfo"> <view class="shareInfo">
<view class="shareGoodsInfo"> <view class="shareGoodsInfo">
夏普4T-M70H7DA 70英寸 4K 高清进口屏智能语音平板液晶电视机6575 {{goods.goods_name}}
</view> </view>
<view class="sharePrice"> <view class="sharePrice">
￥4980 ￥{{goods.goods_price_min}}
</view> </view>
</view> </view>
<view class="shareOpera"> <view class="shareOpera">
<view class="operaItem"> <view class="operaItem" @click="copyText(goods.goods_name)">
<view class="imgIcon"> <view class="imgIcon">
<u-icon name="order" class="iconIm"></u-icon> <u-icon name="order" class="iconIm"></u-icon>
</view> </view>
<view class="shareText"> <view class="shareText" >
复制文案 复制文案
</view> </view>
</view> </view>
<view class="operaItem"> <view class="operaItem" @click="goShare">
<view class="imgIcon weChatIcon"> <view class="imgIcon weChatIcon">
<u-icon name="order" class="iconIm"></u-icon> <u-icon name="order" class="iconIm"></u-icon>
</view> </view>
<view class="shareText"> <view class="shareText">
微信好友 <button open-type="share" @click="shareWechat">微信好友</button>
</view> </view>
</view> </view>
<view class="operaItem"> <view class="operaItem">
@ -301,26 +299,97 @@
setPrice: false, setPrice: false,
openDialog: false, openDialog: false,
goodsId: '', goodsId: '',
goods: {}, goods: {
skuList: []
},
suggestGoodsList: [], suggestGoodsList: [],
userInfo: {}, userInfo: {},
addressList: [], addressList: [],
addressInfo: {}, addressInfo: {},
serveList:[],
token:'',
} }
}, },
onLoad(options) { onLoad(options) {
this.isPre = options.isPre this.isPre = options.isPre
this.goodsId = options.goodsId
this.pre_id = options.pre_id; this.pre_id = options.pre_id;
this.goodsId=options.goodsId; this.goodsId=options.goodsId;
this.getGoodsDetail(options.goodsId)
}, },
onShow() { onShow() {
this.getAddressList() if(uni.getStorageSync('AccessToken')){
this.getSuggestGoods() this.getAddressList()
this.userInfo = uni.getStorageSync('userInfo'); this.getSuggestGoods()
this.getServeList()
this.userInfo = uni.getStorageSync('userInfo');
}else{
this.userInfo = {}
}
this.getGoodsDetail()
}, },
methods: { methods: {
copyText(val){
// 获取要复制的文本内容
let text = val;
uni.setClipboardData({
data: text,
success(res) {
console.log('成功复制到剪贴板');
},
fail(err) {
console.error('复制失败', err);
}
});
},
shareWechat(){
uni.share({
provider: "weixin",
scene: "WXSceneSession",
type: 2,
imageUrl: this.goods.goods_image,
success: function (res) {
console.log("success:" + JSON.stringify(res));
},
fail: function (err) {
console.log("fail:" + JSON.stringify(err));
}
});
},
shareImg(){
this.openDialog =true
this.shareType= 'share'
},
preNow(){
const that = this
let params={
goods_id:that.goods.goods_id,
pre_id:1
}
GoodsApi.presale(params).then(res => {
if (res.status == 200) {
that.$toast(res.message)
}
})
.catch()
},
getServeList(){
const that = this
let params = {
goodsId:that.goodsId
}
return new Promise((resolve, reject) => {
GoodsApi.serveList(params).then(res => {
if (res.status == 200) {
that.serveList = res.data.list
}
})
.catch()
})
},
// 预约成功去列表 // 预约成功去列表
onKonw(){ onKonw(){
uni.navigateTo({ uni.navigateTo({
@ -346,9 +415,9 @@
const that = this const that = this
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
address.list().then(res => { address.list().then(res => {
if (res.code == 200) { if (res.status == 200) {
that.addressList = res.data.list that.addressList = res.data.list
console.log('58555559999') console.log('58555559999',that.addressList)
that.getDefaultAddress() that.getDefaultAddress()
} }
}) })
@ -360,10 +429,12 @@
const that = this const that = this
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
address.defaultId().then(res => { address.defaultId().then(res => {
if (res.code == 200) { if (res.status == 200) {
for (var i = 0; i < that.addressList.length; i++) { for (var i = 0; i < that.addressList.length; i++) {
if (res.data.defaultId == that.addressList[i].address_id) { if (res.data.defaultId == that.addressList[i].address_id) {
that.addressInfo = that.addressList[i] that.addressInfo = that.addressList[i];
console.log(that.addressInfo,'获取地址')
} }
} }
} }
@ -371,17 +442,26 @@
.catch() .catch()
}) })
}, },
toSearch() {
uni.navigateTo({
url: "/pages/search/index"
})
},
choseSku() { choseSku() {
this.showSkuPopup = true this.showSkuPopup = true
}, },
// 获取商品信息 // 获取商品信息
getGoodsDetail(goodsId) { getGoodsDetail() {
const that = this const that = this
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
GoodsApi.detail(goodsId) GoodsApi.detail(this.goodsId)
.then(result => { .then(result => {
that.goods = result.data.detail; let info = result.data.detail;
that.allPicture = result.data.detail.goods_images.length info.content = info.content
.replace(/style=""/g,'')
.replace(/<img src=/g,'<img style="width: 100%; display:block" src=')
that.goods = info;
that.allPicture = info.goods_images.length
}) })
.catch() .catch()
}) })
@ -397,7 +477,7 @@
.catch() .catch()
}, },
goHome() { goHome() {
uni.navigateTo({ uni.switchTab({
url: '/pages/index/index' url: '/pages/index/index'
}) })
}, },
@ -408,6 +488,12 @@
}) })
}, },
goMember() { goMember() {
if(!uni.getStorageSync("AccessToken")) {
uni.navigateTo({
url: "/pages/login/index"
})
return ;
}
uni.navigateTo({ uni.navigateTo({
url: '/pages/member/index' url: '/pages/member/index'
}) })
@ -418,16 +504,16 @@
url: '/pages/cart/index' url: '/pages/cart/index'
}) })
}, },
goSearch() {
// 购物车
uni.navigateTo({
url: '/pages/search/index'
})
},
addCar() { addCar() {
if(!uni.getStorageSync("AccessToken")) {
uni.navigateTo({
url: "/pages/login/index"
})
return ;
}
// 加入购物车 // 加入购物车
const that = this const that = this
goodsCar.add(that.goods.goods_id, that.goods.skuList[0].goods_sku_id, that.goods.spec_type == 20 ? 1 : 1) goodsCar.add(that.goods.goods_id, (that.goods.skuList && that.goods.skuList.length >0?that.goods.skuList[0].goods_sku_id:''), that.goods.spec_type == 20 ? 1 : 1)
.then(res => { .then(res => {
if (res.status == 200) { if (res.status == 200) {
that.$toast(res.message) that.$toast(res.message)
@ -436,9 +522,27 @@
.catch() .catch()
}, },
buyNow() { buyNow() {
if(!uni.getStorageSync("AccessToken")) {
uni.navigateTo({
url: "/pages/login/index"
})
return ;
}
// 立即下单 // 立即下单
console.log(this.token,'登录信息')
// if(!this.token){
// this.$toast('请登录')
// uni.navigateTo({
// url:'/pages/login/index'
// })
// }
if(this.goods.stock_total==0){
return this.$toast('库存不足，请选择其他商品购买')
}
const item = JSON.stringify(this.goods)
uni.navigateTo({ uni.navigateTo({
url: '/pages/sureOrder/index?goodsInfo=' + JSON.stringify(this.goods) url: '/pages/sureOrder/index?goodsID=' +encodeURIComponent(item)
}) })
}, },
shareCancel() { shareCancel() {
@ -451,8 +555,18 @@
.detail { .detail {
width: 100%; width: 100%;
height: 100%; height: 100%;
&-content{
padding: 30rpx;
font-size: 26rpx;
line-height: 50rpx;
width: 710rpx;
margin: 0 auto;
margin-top: 30rpx;
background-color: #fff;
box-sizing: border-box;
}
} }
.slot-wrap { .slot-wrap {
width: 400rpx; width: 400rpx;
margin-left: 60rpx; margin-left: 60rpx;
@ -498,15 +612,26 @@
} }
.share { .share {
display: flex; z-index: 22;
justify-content: space-between; top: 128rpx;
margin-top: 28rpx; width: 54rpx;
height: 54rpx;
position: absolute;
right: 30rpx;
.sp { .sp {
width: 54rpx; width: 54rpx;
height: 54rpx; height: 54rpx;
display: none;
}
button{
width: 100%;
height: 100%;
position: absolute;
left: 0;
top: 0;
z-index: 2;
opacity: 0;
} }
.shareIcon { .shareIcon {
width: 54rpx; width: 54rpx;
height: 54rpx; height: 54rpx;
@ -709,12 +834,11 @@
.goodsDetail { .goodsDetail {
.goodsName { .goodsName {
width: 672rpx; width: 672rpx;
height: 80rpx;
font-size: 28rpx; font-size: 28rpx;
font-family: PingFang SC, PingFang SC; font-family: PingFang SC, PingFang SC;
font-weight: 400; font-weight: 400;
color: #000000; color: #000000;
line-height: 33rpx; line-height: 50rpx;
margin: 28rpx 0 0 28rpx; margin: 28rpx 0 0 28rpx;
} }
@ -931,10 +1055,10 @@
display: flex; display: flex;
flex-wrap: wrap; flex-wrap: wrap;
margin-top: 30rpx; margin-top: 30rpx;
padding-bottom: 20rpx;
overflow: hidden;
.goodsItem { .goodsItem {
margin-right: 18rpx; margin-right: 18rpx;
.img { .img {
width: 204rpx; width: 204rpx;
height: 168rpx; height: 168rpx;
@ -957,10 +1081,9 @@
width: 184rpx; width: 184rpx;
height: 80rpx; height: 80rpx;
font-size: 28rpx; font-size: 28rpx;
font-family: PingFang SC, PingFang SC;
font-weight: 400; font-weight: 400;
color: #000000; color: #000000;
line-height: 33rpx; line-height: 40rpx;
display: -webkit-box; display: -webkit-box;
overflow: hidden; overflow: hidden;
text-overflow: ellipsis; text-overflow: ellipsis;
@ -1020,25 +1143,33 @@
.footerCus { .footerCus {
margin-right: 44rpx; margin-right: 44rpx;
text-align: center;
position: relative;
.cusIcon { .cusIcon {
width: 38rpx; width: 38rpx;
height: 38rpx; height: 38rpx;
margin: 0 auto;
image { image {
width: 100%; width: 100%;
height: 100%; height: 100%;
} }
} }
button{
width: 100%;
height: 100%;
position: absolute;
left: 0;
top: 0;
z-index: 2;
opacity: 0;
}
.customer { .customer {
width: 40rpx; width: 40rpx;
height: 28rpx; height: 28rpx;
font-size: 20rpx; font-size: 20rpx;
font-family: PingFang SC, PingFang SC;
font-weight: 400; font-weight: 400;
color: #3D3D3D; color: #3D3D3D;
line-height: 28rpx; line-height: 40rpx;
} }
.car { .car {

177
pages/index/index.vue
Unescape View File

@ -243,45 +243,52 @@
</view> </view>
</view> </view>
<view class="sameCity" v-if="sameCity"> <view class="sameCity" v-if="sameCity">
<view class="shopBg"> <view class="shopBg" >
</view> </view>
<view class="shopInfo"> <view class="shopInfo">
<view class="shopName"> <view class="shopName">
<view class="name"> <view class="name">
昆明湖店·YN_k121 {{cityInfo.shop_name}}
</view> </view>
<view class="status"> <view class="status">
营业中 营业中
</view> </view>
</view> </view>
<view class="star"> <view class="star">
<image src="/static/home/star.png" mode="" class="starImg" v-for="(item,index) in 5" <image src="/static/home/star.png" mode="" class="starImg" v-for="(item,index) in cityInfo.star"
:key="index"></image> :key="index"></image>
<text>5.0</text> <text>5.0</text>
</view> </view>
<view class="openTime"> <view class="openTime">
营业时间：9:00-21:30 营业时间：{{cityInfo.shop_hours}}
</view> </view>
<view class="tip"> <view class="tip">
<view class="tipItem" v-for="(item,index) in 4" :key="index"> <view class="tipleft">
手机选购 <view class="tipItem" v-for="(item,index) in cityInfo.remark" :key="index">
</view> {{item}}
<view class="ask">
<image src="/static/user/weChat.png" mode="" class="weChat"></image>
<view class="askText">
咨询
</view> </view>
</view> </view>
<view class="al">
</view> <view class="tipRight">
<view class="ask"> <view class="ask">
<image src="/static/home/ph.png" mode="" class="weChat"></image> <image src="/static/user/weChat.png" mode="" class="weChat"></image>
<view class="askText"> <view class="askText">
电话 咨询
</view>
</view>
<view class="al">
</view>
<view class="ask">
<image src="/static/home/ph.png" mode="" class="weChat"></image>
<view class="askText">
电话
</view>
</view> </view>
</view> </view>
</view> </view>
<view class="hline"> <view class="hline">
@ -289,15 +296,15 @@
<view class="shopAddress"> <view class="shopAddress">
<view class="address"> <view class="address">
<view class="ad"> <view class="ad">
昆明市盘龙区盘江路瀑布公园广场 {{cityInfo.address}}
<u-icon name="arrow-right"></u-icon> <u-icon name="arrow-right"></u-icon>
</view> </view>
<view class="adInfo"> <view class="adInfo">
<u-icon name="map-fill"></u-icon> <u-icon name="map-fill"></u-icon>
距地铁2号线大道站2号口600m {{cityInfo.summary}}
</view> </view>
</view> </view>
<view class="pCar"> <view class="pCar" @click="toPark">
<image src="/static/home/p.png" mode="" class="p"></image> <image src="/static/home/p.png" mode="" class="p"></image>
<view class="car"> <view class="car">
附近停车场 附近停车场
@ -335,8 +342,8 @@
</view> </view>
</view> </view>
<view class="pictureList"> <view class="pictureList">
<view class="picItem" v-for="(item,index) in 3" :key="index"> <view class="picItem" v-for="(item,index) in cityInfo.imageList" :key="index">
<image src="/static/home/up.png" alt="" class="pic"></image> <image :src="item" alt="" class="pic"></image>
</view> </view>
</view> </view>
</view> </view>
@ -353,15 +360,15 @@
<view class="customerEvalu"> <view class="customerEvalu">
<view class="cusInfo"> <view class="cusInfo">
<view class="cusLeft"> <view class="cusLeft">
<image src="" mode="" class="ch"></image> <image :src="cityInfo.evaluate.image" mode="" class="ch"></image>
<text class="cusName">Shark特</text> <text class="cusName">{{cityInfo.evaluate.nickname}}</text>
</view> </view>
<view class="day"> <view class="day">
1天前 1天前
</view> </view>
</view> </view>
<view class="evaluateInfo"> <view class="evaluateInfo">
非常棒，讲解细致，下次还来！ {{cityInfo.evaluate.content}}
</view> </view>
</view> </view>
<view class="evaLine"> <view class="evaLine">
@ -377,8 +384,8 @@
</view> </view>
</view> </view>
<view class="pictureList"> <view class="pictureList">
<view class="picItem" v-for="(item,index) in 3" :key="index"> <view class="picItem" v-for="(item,index) in cityInfo.imageList" :key="index">
<image src="/static/home/up.png" alt="" class="pic"></image> <image :src="item" alt="" class="pic"></image>
</view> </view>
</view> </view>
</view> </view>
@ -393,7 +400,15 @@
</view> </view>
</view> </view>
<view class="steps"> <view class="steps">
<u-steps :list="numList" mode="dot" direction="column"></u-steps> <u-time-line-item node-top="2">
<template v-slot:node>
<u-icon name="pushpin-fill" color="#ddd" :size="24"></u-icon>
</template>
<template v-slot:content>
{{cityInfo.history.contenmt}}
</template>
</u-time-line-item>
<!-- <u-steps :list="numList" mode="dot" direction="column"></u-steps> -->
</view> </view>
</view> </view>
</view> </view>
@ -440,6 +455,7 @@
], ],
goodsType: [], goodsType: [],
cityInfo:{}
} }
}, },
onShow() { onShow() {
@ -447,9 +463,22 @@
this.getRankingList(); this.getRankingList();
this.getbrandList(); this.getbrandList();
this.getSeckill(); this.getSeckill();
this.getSuggest() this.getSuggest();
this.getCityInfo()
}, },
methods: { methods: {
getCityInfo(){
const that =this
GoodsApi.cityInfo()
.then(res => {
if (res.status == 200) {
that.cityInfo = res.data
}
})
.finally(() => {})
},
getTypeList() { getTypeList() {
const that = this const that = this
GoodsApi.typeList() GoodsApi.typeList()
@ -563,6 +592,12 @@
url: '/pages/search/index' url: '/pages/search/index'
}) })
}, },
toPark(){
// 停车指引
uni.navigateTo({
url: '/pages/news/park/index'
})
},
goDetails(item) { goDetails(item) {
uni.navigateTo({ uni.navigateTo({
url: '/pages/goods/detail?goodsId=' + item.goods_id url: '/pages/goods/detail?goodsId=' + item.goods_id
@ -1254,7 +1289,7 @@
display: block; display: block;
width: 90rpx; width: 90rpx;
margin: 0 auto; margin: 0 auto;
text-align: center; text-align: left;
margin-top: 5rpx; margin-top: 5rpx;
} }
} }
@ -1660,7 +1695,7 @@
font-weight: 600; font-weight: 600;
text-align: left; text-align: left;
white-space: nowrap; white-space: nowrap;
line-height: 36rpx; line-height: 50rpx;
} }
.text_16 { .text_16 {
@ -1740,7 +1775,7 @@
.shopInfo { .shopInfo {
width: 698rpx; width: 698rpx;
height: 400rpx; min-height: 400rpx;
background: linear-gradient(180deg, rgba(255, 255, 255, 0.86) 0%, #FFFFFF 100%); background: linear-gradient(180deg, rgba(255, 255, 255, 0.86) 0%, #FFFFFF 100%);
border-radius: 8rpx 8rpx 8rpx 8rpx; border-radius: 8rpx 8rpx 8rpx 8rpx;
opacity: 1; opacity: 1;
@ -1801,23 +1836,49 @@
.tip { .tip {
display: flex; display: flex;
justify-content: space-between;
margin-top: 10rpx; margin-top: 10rpx;
.tipleft{
.tipItem { display: flex;
margin-right: 10rpx; .tipItem {
width: 116rpx; margin-right: 10rpx;
height: 42rpx; width: 116rpx;
background: #F5F5F5; height: 42rpx;
border-radius: 4rpx 4rpx 4rpx 4rpx; background: #F5F5F5;
opacity: 1; border-radius: 4rpx 4rpx 4rpx 4rpx;
text-align: center; opacity: 1;
line-height: 42rpx; text-align: center;
font-size: 24rpx; line-height: 42rpx;
font-weight: 400; font-size: 24rpx;
color: #818181; font-weight: 400;
color: #818181;
}
}
.tipRight{
display: flex;
align-items: center;
.ask {
margin-left: 16rpx;
position: relative;
top: -20rpx;
.weChat {
width: 32rpx;
height: 32rpx;
}
.askText {
height: 28rpx;
font-size: 20rpx;
font-weight: 400;
color: #989898;
line-height: 28rpx;
}
}
} }
.al { .al {
width: 0rpx; width: 0rpx;
@ -1827,25 +1888,7 @@
margin-left: 8rpx; margin-left: 8rpx;
} }
.ask {
margin-left: 16rpx;
position: relative;
top: -20rpx;
.weChat {
width: 32rpx;
height: 32rpx;
}
.askText {
height: 28rpx;
font-size: 20rpx;
font-weight: 400;
color: #989898;
line-height: 28rpx;
}
}
} }
.hline { .hline {
@ -1871,7 +1914,7 @@
} }
.adInfo { .adInfo {
height: 40rpx; min-height: 40rpx;
font-size: 28rpx; font-size: 28rpx;
font-family: PingFang SC, PingFang SC; font-family: PingFang SC, PingFang SC;
font-weight: 400; font-weight: 400;

2
pages/news/article/classify.vue
Unescape View File

@ -64,7 +64,7 @@
uni.showToast({ uni.showToast({
title: "提交成功" title: "提交成功"
}) })
uni.$emit("reloadClasssify") uni.$emit("reloadClasssify",{msg:'页面更新'})
setTimeout(()=>{ setTimeout(()=>{
uni.navigateBack({ uni.navigateBack({
delta: 1 delta: 1

15
pages/news/coupon/list.vue
Unescape View File

@ -5,7 +5,7 @@
:is-scroll="false" v-model="tabIndex" @change="change"></u-tabs> :is-scroll="false" v-model="tabIndex" @change="change"></u-tabs>
</view> </view>
<view class="coupon-bd"> <view class="coupon-bd">
<view class="item" :class="tabIndex == 2?'item-on':''" v-for="(item,index) in couponList" :key="index"> <view class="item" :class="tabIndex == 2?'item-on':''" v-for="(item,index) in couponList" :key="index" @click="choseItem(item)" :style="{'border':item.user_coupon_id==choseId?'2rpx solid red':none}">
<view class="a" v-if="item.coupon_type==10">￥<text>{{item.reduce_price}}</text></view> <view class="a" v-if="item.coupon_type==10">￥<text>{{item.reduce_price}}</text></view>
<view class="a" v-if="item.coupon_type==20"><text>{{item.discount}}折</text></view> <view class="a" v-if="item.coupon_type==20"><text>{{item.discount}}折</text></view>
<view class="b">有效期：{{item.end_time}}</view> <view class="b">有效期：{{item.end_time}}</view>
@ -39,6 +39,7 @@
export default { export default {
data() { data() {
return { return {
choseId:'',
list: [{ list: [{
name: '未使用', name: '未使用',
val:'isUsable' val:'isUsable'
@ -50,13 +51,23 @@
val:'isExpire' val:'isExpire'
}], }],
tabIndex: 0, tabIndex: 0,
couponList:[] couponList:[],
isChose:false
} }
}, },
onLoad(o){
this.isChose = o.chose
},
onShow() { onShow() {
this.getCoupon(this.tabIndex) this.getCoupon(this.tabIndex)
}, },
methods: { methods: {
choseItem(item){
if(this.isChose){
uni.setStorageSync('couponId',item.coupon_id)
uni.navigateBack()
}
},
getCoupon(e) { getCoupon(e) {
const that = this const that = this
let param={ let param={

2
pages/news/park/recordHistory.vue
Unescape View File

@ -195,4 +195,4 @@
} }
} }
} }
</style> </style>

34
pages/news/rules/rulesList.vue
Unescape View File

@ -1,39 +1,39 @@
<template> <template>
<view class="pages"> <view class="pages">
<view class="header"> <view class="header">
<u-navbar is-back="false" :title="title" ></u-navbar> <u-navbar is-back="false" :title="title"></u-navbar>
</view> </view>
<view class="content"> <view class="content">
<view v-for="(item,index) in list" :key="index" class="item"> <view v-for="(item,index) in list" :key="index" class="item">
<view class="title" @click="goRules(item)"> <view class="title" @click="goRules(item)">
{{item.title}} {{item.title}}
</view> </view>
<u-line /> <u-line />
</view> </view>
</view> </view>
</view> </view>
</template> </template>
<script> <script>
export default{ export default {
data(){ data() {
return{ return {
title:'', title: '',
list:[], list: [],
itemInfo:{} itemInfo: {}
} }
}, },
onLoad(options){ onLoad(options) {
this.itemInfo = JSON.parse(options.itemInfo) this.itemInfo = JSON.parse(options.itemInfo)
this.title = this.itemInfo.name this.title = this.itemInfo.name
this.list = this.itemInfo.child this.list = this.itemInfo.child
}, },
methods:{ methods: {
goRules(item){ goRules(item) {
uni.navigateTo({ uni.navigateTo({
url:'/pages/news/rules/index?itemInfo='+JSON.stringify(item) url: '/pages/news/rules/index?itemInfo=' + JSON.stringify(item)
}) })
} }
} }
@ -41,15 +41,17 @@
</script> </script>
<style scoped lang="scss"> <style scoped lang="scss">
.pages{ .pages {
width: 100%; width: 100%;
height: 100%; height: 100%;
padding: 30rpx; padding: 30rpx;
} }
.item{
.item {
margin-bottom: 28rpx; margin-bottom: 28rpx;
} }
.title{
.title {
margin-bottom: 28rpx; margin-bottom: 28rpx;
} }
</style> </style>

5
pages/search/index.vue
Unescape View File

@ -79,10 +79,13 @@
this.searchList = uni.getStorageSync('searchList') this.searchList = uni.getStorageSync('searchList')
this.searchList = Array.from(new Set(this.searchList)); this.searchList = Array.from(new Set(this.searchList));
} }
this.getHot()
}, },
methods: { methods: {
getHot(){
},
searchGoods(item){ searchGoods(item){
this.searchList.push(this.searchValue) this.searchList.push(this.searchValue)
this.searchList = Array.from(new Set(this.searchList)); this.searchList = Array.from(new Set(this.searchList));

255
pages/sureOrder/index.vue
Unescape View File

@ -23,7 +23,7 @@
</view> </view>
</view> </view>
<view class="getSelf"> <view class="getSelf">
<view class="shopAddress"> <view class="shopAddress" v-if="buyType=='zq'">
<view class="youTime"> <view class="youTime">
花梨服务站 花梨服务站
</view> </view>
@ -33,9 +33,9 @@
</view> </view>
</view> </view>
<view class="addressDetail"> <view class="addressDetail">
{{addressInfo.name}} {{addressInfo.name}} {{addressInfo.region.province +addressInfo.region.city+addressInfo.region.region}}
</view> </view>
<view class="lookMap"> <view class="lookMap" v-if="buyType=='zq'">
<image src="/static/user/address.png" mode="" class="addressIcon"></image> <image src="/static/user/address.png" mode="" class="addressIcon"></image>
<view class="range"> <view class="range">
距您16.39km 距您16.39km
@ -94,7 +94,7 @@
<switch /> <switch />
</view> </view>
</view> </view>
<view class="time"> <!-- <view class="time">
<view class="youTime"> <view class="youTime">
预计到货时间 预计到货时间
</view> </view>
@ -103,8 +103,8 @@
<image src="/static/order/left.png" mode=""></image> <image src="/static/order/left.png" mode=""></image>
</view> </view>
</view> </view> -->
<view class="time"> <!-- <view class="time">
<view class="youTime"> <view class="youTime">
您期待的收货时间 您期待的收货时间
</view> </view>
@ -112,7 +112,7 @@
请选择 请选择
<image src="/static/order/left.png" mode=""></image> <image src="/static/order/left.png" mode=""></image>
</view> </view>
</view> </view> -->
<view class="goodsDetail"> <view class="goodsDetail">
<view class="goodsType"> <view class="goodsType">
<image src="/static/order/bag.png" mode="" class="bag"></image> <image src="/static/order/bag.png" mode="" class="bag"></image>
@ -121,14 +121,14 @@
</view> </view>
<view class="goods"> <view class="goods">
<view class="goodsImg"> <view class="goodsImg">
<image src="/static/home/goodsDemo.png" mode=""></image> <image :src="goodsInfo.goods_image" mode=""></image>
</view> </view>
<view class="goodsInfo"> <view class="goodsInfo">
<view class="goodsName"> <view class="goodsName">
iphone13 绿色 128GB {{goodsInfo.goods_name}}
</view> </view>
<view class="goodsPrice"> <view class="goodsPrice">
￥ <text>7599</text> ￥ <text>{{goodsInfo.goods_price_min}}</text>
</view> </view>
</view> </view>
<view class="goodsNum"> <view class="goodsNum">
@ -137,13 +137,11 @@
</view> </view>
</view> </view>
<view class="time"> <view class="time">
<view class="youTime"> <view class="youTime" style="width: 60rpx;">
留言 留言
</view> </view>
<view class="leftImg"> <input type="textarea" placeholder="建议留言前先和店家沟通" v-model="remark" style="width:100%;" maxlength="100" />
建议留言前与客服沟通确认
<image src="/static/order/left.png" mode=""></image>
</view>
</view> </view>
<view class="orderTips"> <view class="orderTips">
<view class="orderTitle"> <view class="orderTitle">
@ -151,7 +149,7 @@
商品总额 商品总额
</view> </view>
<view class="price"> <view class="price">
￥7599 ￥{{goodsInfo.goods_price_min}}
</view> </view>
</view> </view>
<view class="orderTitle"> <view class="orderTitle">
@ -159,7 +157,7 @@
运费 运费
</view> </view>
<view class="price"> <view class="price">
￥7599 ￥{{goodsInfo.goods_price_min}}
</view> </view>
</view> </view>
<view class="orderTitle"> <view class="orderTitle">
@ -174,8 +172,8 @@
<view class="total"> <view class="total">
优惠券 优惠券
</view> </view>
<view class="price"> <view class="price" @click="choseCoupon">
<text class="couponNum">0张可用</text> <text class="couponNum">{{couponList.length}}张可用</text>
<image src="/static/order/left.png" mode=""></image> <image src="/static/order/left.png" mode=""></image>
</view> </view>
</view> </view>
@ -188,7 +186,7 @@
</view> </view>
<view class="right"> <view class="right">
<text class="totalNum">共1件，合计：</text> <text class="totalNum">共1件，合计：</text>
<text class="allPrice">￥7664</text> <text class="allPrice">￥{{goodsInfo.goods_price_min}}</text>
</view> </view>
</view> </view>
</view> </view>
@ -204,30 +202,32 @@
</view> </view>
<view class="itemType"> <view class="itemType">
<view class="payName"> <view class="" v-for="(item,index) in payMethList" :key="index" @click="chosePayType(item)">
<image src="/static/order/friends.png" mode="" class="payIcon"></image> <view class="payName">
找微信好友代付 <image src="/static/order/friends.png" mode="" class="payIcon"></image>
余额支付
</view>
<image src="/static/order/right.png" mode="" class="chose" v-if="payType==item.method"></image>
</view> </view>
<!-- <image src="/static/order/right.png" mode="" class="chose"></image> -->
</view> </view>
<view class="line"> <view class="line">
</view> </view>
<view class="itemType"> <!-- <view class="itemType">
<view class="payName"> <view class="payName">
<image src="/static/order/shop.png" mode="" class="payIcon"></image> <image src="/static/order/shop.png" mode="" class="payIcon"></image>
到店支付 到店支付
</view> </view>
<!-- <image src="/static/order/right.png" mode="" class="chose"></image> -->
</view> </view> -->
</view> </view>
<view class="footer"> <view class="footer">
<view class="meetPrice"> <view class="meetPrice">
应付款 应付款
<text class="type">￥</text> <text class="type">￥</text>
<text class="price">7640</text> <text class="price">{{goodsInfo.goods_price_min}}</text>
</view> </view>
<view class="btn" @click="orderSubmit"> <view class="btn" @click="orderPay">
提交订单 提交订单
</view> </view>
</view> </view>
@ -239,9 +239,16 @@
import img from "@/static/member/head.png" import img from "@/static/member/head.png"
import * as storeShop from '@/api/shop.js' import * as storeShop from '@/api/shop.js'
import * as address from '@/api/address.js' import * as address from '@/api/address.js'
import * as cashier from '@/api/cashier/index.js'
import * as CouponApi from '@/api/coupon'
import {
Wechat
} from '@/core/payment'
export default { export default {
data() { data() {
return { return {
remark: '',
payType: 'weChat',
buyType: 'sm', buyType: 'sm',
background: { background: {
background: 'url(' + img + ') center top no-repeat', background: 'url(' + img + ') center top no-repeat',
@ -250,31 +257,61 @@
goodsInfo: {}, goodsInfo: {},
shopInfo: {}, shopInfo: {},
addressList: [], addressList: [],
addressInfo: {} addressInfo: {},
payMethList: [],
orderID: '',
couponList: [],
} }
}, },
onLoad(options) { onLoad(options) {
if (options.goodsInfo) { console.log(options, 'kkkkkk')
this.goodsInfo = JSON.parse(options.goodsInfo) // if (options.goodsInfo) {
} let goodsInfo = options.goodsID;
console.log(goodsInfo, '5555555', typeof(goodsInfo));
this.goodsInfo = JSON.parse(decodeURIComponent(goodsInfo))
console.log(this.goodsInfo, '666666');
// }
}, },
onShow() { onShow() {
this.getGoodsInfo() this.getShopInfo()
this.getAddressList(); this.getAddressList();
this.orderSubmit()
this.getCoupon()
}, },
methods: { methods: {
getCoupon() {
const that =this
let param = {
dataType:'isUsable'
}
CouponApi.myCouponList(param)
.then(res => {
that.couponList = res.data.list.data
})
.finally()
},
choseCoupon() {
// 选择优惠券
uni.navigateTo({
url: '/pages/news/coupon/list?chose=true',
})
},
chosePayType(item) {
this.payType = item.method
},
choseType(val) { choseType(val) {
this.buyType = val this.buyType = val
}, },
getDefaultAddress() { getDefaultAddress() {
const that = this
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
address.defaultId().then(res => { address.defaultId().then(res => {
if (res.code == 200) { if (res.status == 200) {
for (var i = 0; i < that.addressList.length; i++) { for (var i = 0; i < that.addressList.length; i++) {
if (res.data.defaultId == that.addressList[i].address_id) { if (res.data.defaultId == that.addressList[i].address_id) {
that.addressInfo = that.addressList[i] that.addressInfo = that.addressList[i]
that.getOrderInfo() console.log(that.addressInfo, '获取收货地址')
} }
} }
} }
@ -282,23 +319,11 @@
.catch() .catch()
}) })
}, },
getOrderInfo() {
const that = this
return new Promise((resolve, reject) => {
address.list().then(res => {
if (res.code == 200) {
that.addressList = res.data.list
that.getDefaultAddress()
}
})
.catch()
})
},
getAddressList() { getAddressList() {
const that = this const that = this
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
address.list().then(res => { address.list().then(res => {
if (res.code == 200) { if (res.status == 200) {
that.addressList = res.data.list that.addressList = res.data.list
that.getDefaultAddress() that.getDefaultAddress()
} }
@ -306,7 +331,7 @@
.catch() .catch()
}) })
}, },
getGoodsInfo() { getShopInfo() {
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
storeShop.list().then(res => { storeShop.list().then(res => {
console.log(res, '获取店铺信息') console.log(res, '获取店铺信息')
@ -316,25 +341,131 @@
}, },
orderSubmit() { orderSubmit() {
const that = this const that = this;
console.log(that.goodsInfo, '55555')
let params = { let params = {
mode: '结算模式', mode: 'buyNow',
delivery: '配送方式（10快递配送 20上门自提', delivery: '10',
couponId: '', couponId: '',
isUsePoints: 0, isUsePoints: 0,
remark: '留言', remark: that.remark,
shopId: '', shopId: '',
linkman: '姓名', linkman: '',
phone: '手机哈', phone: '',
goodsId: '商品id', goodsId: that.goodsInfo.goods_id,
goodsNum: 1, goodsNum: 1,
goodsSkuId: '', goodsSkuId: that.goodsInfo.skuList[0].goods_sku_id,
cartIds: '' cartIds: ''
} }
order.submit(params) order.submit('buyNow', params)
.then(res => {
if (res.status == 200) {
that.orderId = res.data.orderId
that.getOrderInfoPay(res.data.orderId)
}
})
.catch()
},
getOrderInfoPay(val) {
cashier.orderInfo(val).then(res => {
if (res.status == 200) {
this.payMethList = res.data.paymentMethods
}
})
.catch()
},
onShowSuccess(res) {
this.$toast(message || '订单支付成功')
uni.navigateTo({
url: '/pages/news/recycling/orderList'
})
},
orderPay() {
const that = this
if (that.payType == 'balance') {
that.payBanlance()
return
}
cashier.orderPay(that.orderID).then(res => {
if (res.status == 200) {
let paymentData = res.data.payment
Wechat.payment({
orderKey: res.data.payment.out_trade_no,
...paymentData
})
.then((result) => {
console.log(result)
that.onShowSuccess(result)
})
.catch(err => {
console.log(err)
})
}
})
.catch()
},
payBanlance() {
const that = this
let params = {
extra: {},
method: 'balance',
client: 'weChat'
}
cashier.orderPay(that.orderID, params).then(res => {
that.$toast(res.message)
if (res.status == 200) {
setTimeout(() => {
uni.navigateTo({
url: '/pages/news/recycling/orderList'
})
}, 1000)
}
})
.catch()
},
// getOrderInfo() {
// const that = this
// let params = {
// orderId: 10202,
// client: 'wechat'
// }
// cashier.orderInfo(params)
// .then(res => {
// if (res.status == 200) {
// that.payOrderInfo()
// }
// })
// .catch()
// },
payOrderInfo() {
const that = this
let form = {
client: 'wechat',
method: 'wechat',
extra: {}
}
cashier.orderInfo(10202, form)
.then(res => { .then(res => {
if (res.status == 200) { if (res.status == 200) {
// that.$toast(res.message)
let paymentData = res.data.payment
Wechat.payment({
orderKey: res.data.payment.out_trade_no,
...paymentData
})
.then((result) => {
console.log(result)
})
.catch(err => {
console.log(err)
})
} }
}) })
.catch() .catch()
@ -607,7 +738,7 @@
.goodsDetail { .goodsDetail {
width: 694rpx; width: 694rpx;
height: 266rpx; min-height: 266rpx;
background: #FFFFFF; background: #FFFFFF;
border-radius: 10rpx 10rpx 10rpx 10rpx; border-radius: 10rpx 10rpx 10rpx 10rpx;
opacity: 1; opacity: 1;
@ -656,7 +787,7 @@
margin-left: 20rpx; margin-left: 20rpx;
.goodsName { .goodsName {
height: 40rpx; min-height: 40rpx;
font-size: 28rpx; font-size: 28rpx;
font-family: PingFang SC, PingFang SC; font-family: PingFang SC, PingFang SC;
font-weight: 400; font-weight: 400;

7
pages/user/index.vue
Unescape View File

@ -127,7 +127,7 @@
</view> </view>
<view class="coupon" v-if="userInfo.user_type!=40"> <view class="coupon" v-if="userInfo.user_type!=40">
<view class="walletList"> <view class="walletList">
<view class="listItem"> <view class="listItem" @click="preList">
<view class="num"> <view class="num">
235 235
</view> </view>
@ -486,6 +486,11 @@
this.getSuggest() this.getSuggest()
}, },
methods: { methods: {
preList(){
uni.navigateTo({
url:'/pages/news/park/recordHistory'
})
},
getSuggest() { getSuggest() {
// 获取推荐商品 // 获取推荐商品
const that = this const that = this

Write Preview
Loading…
Cancel
Save