1.对接团油接口

yj-dev
杨杰 4 years ago
parent f6fc4710a0
commit d88bbdedc7
  1. 1
      App.vue
  2. 6
      Utils/Api.js
  3. 18
      pages copy.json
  4. 456
      pages/goods/goods-list/goods-list.vue
  5. 6
      pages/goods/goods.vue
  6. 738
      pages/goods/ratings/ratings.vue
  7. 180
      pages/goods/refuel-confirm/refuel-confirm.vue
  8. 130
      pages/goods/refuel-details/refuel-details.vue
  9. 57
      pages/goods/refuel-succes/refuel-succes.vue
  10. 295
      pages/goods/refuel/refuel.vue
  11. 14
      pages/order/confirmation.vue
  12. 8
      pages/pay/payment/payment.vue
  13. 12
      pages/tabBar/cart/cart.vue
  14. 67
      pages/tabBar/category/category.vue
  15. 82
      pages/tabBar/home/home.vue
  16. 39
      pages/tabBar/user/user.vue
  17. 8
      pages/user/Charge/Charge.vue
  18. 442
      pages/user/address/address.vue
  19. 500
      pages/user/address/edit/edit.vue
  20. 10
      pages/user/business/business.vue
  21. 6
      pages/user/coupon/coupon.vue
  22. 12
      pages/user/deposit/deposit.vue
  23. 8
      pages/user/keep/keep.vue
  24. 6
      pages/user/mineCoupons/mineCoupons.vue
  25. 4
      pages/user/minePromotion/minePromotion.vue
  26. 222
      pages/user/myQR/myQR.vue
  27. 30
      pages/user/order_details/order_details.vue
  28. 62
      pages/user/order_list/order_list.vue
  29. 60
      pages/user/positioning/positioning.vue
  30. 20
      static/css/login.scss
  31. BIN
      static/img/jt.png
  32. 930
      uni.scss

@ -20,6 +20,7 @@
token: '', token: '',
brestToken:'', brestToken:'',
cityId: '', cityId: '',
cityName:'',
longitude : '', longitude : '',
latitude : '' latitude : ''
}, },

@ -140,6 +140,12 @@ export const getGasDetailByStoreKey = params => {
return POST('GET', `${base}/highGas/getGasDetailByStoreKey`, params).then(res => res.data); return POST('GET', `${base}/highGas/getGasDetailByStoreKey`, params).then(res => res.data);
} }
//获取已开通的省份
export const getDredgeProvince = params => {
return POST('GET', `${base}/common/getDredgeProvince`, params).then(res => res.data);
}
/** /**
* H5 获取用户信息 * H5 获取用户信息
*/ */

@ -58,8 +58,8 @@
"style": { "style": {
"enablePullDownRefresh": true, "enablePullDownRefresh": true,
"backgroundTextStyle": "light", "backgroundTextStyle": "light",
"navigationBarBackgroundColor": "#f06c7a", "navigationBarBackgroundColor": "#0083f5",
"backgroundColorTop": "#f06c7a", "backgroundColorTop": "#0083f5",
"navigationBarTextStyle": "white", "navigationBarTextStyle": "white",
"app-plus": { "app-plus": {
"titleNView": false, // "titleNView": false, //
@ -109,7 +109,7 @@
"path": "pages/login/login", "path": "pages/login/login",
"style": { "style": {
"navigationBarTitleText": "登录", "navigationBarTitleText": "登录",
"navigationBarBackgroundColor": "#f06c7a", "navigationBarBackgroundColor": "#0083f5",
"navigationBarTextStyle": "white", "navigationBarTextStyle": "white",
"app-plus": { "app-plus": {
"bounce": "none", // "bounce": "none", //
@ -121,7 +121,7 @@
"path": "pages/login/register", "path": "pages/login/register",
"style": { "style": {
"navigationBarTitleText": "手机号登录", "navigationBarTitleText": "手机号登录",
"navigationBarBackgroundColor": "#f06c7a", "navigationBarBackgroundColor": "#0083f5",
"navigationBarTextStyle": "white", "navigationBarTextStyle": "white",
"app-plus": { "app-plus": {
"bounce": "none", // "bounce": "none", //
@ -133,7 +133,7 @@
"path": "pages/login/resetpasswd", "path": "pages/login/resetpasswd",
"style": { "style": {
"navigationBarTitleText": "重置密码", "navigationBarTitleText": "重置密码",
"navigationBarBackgroundColor": "#f06c7a", "navigationBarBackgroundColor": "#0083f5",
"navigationBarTextStyle": "white", "navigationBarTextStyle": "white",
"app-plus": { "app-plus": {
"bounce": "none", // "bounce": "none", //
@ -174,7 +174,7 @@
"path": "pages/user/coupon/coupon", "path": "pages/user/coupon/coupon",
"style": { "style": {
"navigationBarTitleText": "优惠券", "navigationBarTitleText": "优惠券",
"navigationBarBackgroundColor": "#f06c7a", "navigationBarBackgroundColor": "#0083f5",
"navigationBarTextStyle": "white", "navigationBarTextStyle": "white",
"app-plus": { "app-plus": {
"bounce": "none" "bounce": "none"
@ -184,7 +184,7 @@
"path": "pages/user/keep/keep", "path": "pages/user/keep/keep",
"style": { "style": {
"navigationBarTitleText": "我的收藏", "navigationBarTitleText": "我的收藏",
"navigationBarBackgroundColor": "#f06c7a", "navigationBarBackgroundColor": "#0083f5",
"navigationBarTextStyle": "white", "navigationBarTextStyle": "white",
"app-plus": { "app-plus": {
"bounce": "none" "bounce": "none"
@ -268,7 +268,7 @@
}, },
"tabBar": { "tabBar": {
"color": "#333333", "color": "#333333",
"selectedColor": "#f06c7a", "selectedColor": "#0083f5",
"borderStyle": "black", "borderStyle": "black",
"backgroundColor": "#ffffff", "backgroundColor": "#ffffff",
"list": [{ "list": [{
@ -297,4 +297,4 @@
} }
] ]
} }
} }

@ -1,27 +1,27 @@
<template> <template>
<view> <view>
<!-- 商品数据 --> <!-- 商品数据 -->
<!-- <view class="header" :style="{position:headerPosition,top:headerTop}"> <!-- <view class="header" :style="{position:headerPosition,top:headerTop}">
<view class="target" v-for="(target,index) in orderbyList" @tap="select(index)" :key="index" :class="[target.selected?'on':'']"> <view class="target" v-for="(target,index) in orderbyList" @tap="select(index)" :key="index" :class="[target.selected?'on':'']">
{{target.text}} {{target.text}}
<view v-if="target.orderbyicon" class="icon" :class="target.orderbyicon[target.orderby]"></view> <view v-if="target.orderbyicon" class="icon" :class="target.orderbyicon[target.orderby]"></view>
</view> </view>
</view> --> </view> -->
<!-- 占位 --> <!-- 占位 -->
<view class="place"></view> <view class="place"></view>
<!-- 商品列表 --> <!-- 商品列表 -->
<view class="goods-list"> <view class="goods-list">
<view class="product-list"> <view class="product-list">
<view class="product" v-for="(goods) in goodsList" :key="goods.goods_id" @tap="toGoods(goods)"> <view class="product" v-for="(goods) in goodsList" :key="goods.goods_id" @tap="toGoods(goods)">
<image mode="widthFix" :src="goods.img"></image> <image mode="widthFix" :src="goods.img"></image>
<view class="name">{{goods.name}}</view> <view class="name">{{goods.name}}</view>
<view class="info"> <view class="info">
<view class="price">{{goods.price}}</view> <view class="price">{{goods.price}}</view>
<view class="slogan">{{goods.slogan}}</view> <view class="slogan">{{goods.slogan}}</view>
</view> </view>
</view> </view>
</view> </view>
<view class="loading-text">{{loadingText}}</view> <view class="loading-text">{{loadingText}}</view>
</view> </view>
</view> </view>
</template> </template>
@ -30,219 +30,219 @@
export default { export default {
data() { data() {
return { return {
goodsList:[ goodsList:[
{ goods_id: 0, img: '/static/img/goods/p1.jpg', name: '商品名称商品名称商品名称商品名称商品名称', price: '¥168', slogan:'1235人付款' }, { goods_id: 0, img: '/static/img/goods/p1.jpg', name: '商品名称商品名称商品名称商品名称商品名称', price: '¥168', slogan:'1235人付款' },
{ goods_id: 1, img: '/static/img/goods/p2.jpg', name: '商品名称商品名称商品名称商品名称商品名称', price: '¥168', slogan:'1235人付款' }, { goods_id: 1, img: '/static/img/goods/p2.jpg', name: '商品名称商品名称商品名称商品名称商品名称', price: '¥168', slogan:'1235人付款' },
{ goods_id: 2, img: '/static/img/goods/p3.jpg', name: '商品名称商品名称商品名称商品名称商品名称', price: '¥168', slogan:'1235人付款' }, { goods_id: 2, img: '/static/img/goods/p3.jpg', name: '商品名称商品名称商品名称商品名称商品名称', price: '¥168', slogan:'1235人付款' },
{ goods_id: 3, img: '/static/img/goods/p4.jpg', name: '商品名称商品名称商品名称商品名称商品名称', price: '¥168', slogan:'1235人付款' }, { goods_id: 3, img: '/static/img/goods/p4.jpg', name: '商品名称商品名称商品名称商品名称商品名称', price: '¥168', slogan:'1235人付款' },
{ goods_id: 4, img: '/static/img/goods/p5.jpg', name: '商品名称商品名称商品名称商品名称商品名称', price: '¥168', slogan:'1235人付款' }, { goods_id: 4, img: '/static/img/goods/p5.jpg', name: '商品名称商品名称商品名称商品名称商品名称', price: '¥168', slogan:'1235人付款' },
{ goods_id: 5, img: '/static/img/goods/p6.jpg', name: '商品名称商品名称商品名称商品名称商品名称', price: '¥168', slogan:'1235人付款' }, { goods_id: 5, img: '/static/img/goods/p6.jpg', name: '商品名称商品名称商品名称商品名称商品名称', price: '¥168', slogan:'1235人付款' },
{ goods_id: 6, img: '/static/img/goods/p7.jpg', name: '商品名称商品名称商品名称商品名称商品名称', price: '¥168', slogan:'1235人付款' }, { goods_id: 6, img: '/static/img/goods/p7.jpg', name: '商品名称商品名称商品名称商品名称商品名称', price: '¥168', slogan:'1235人付款' },
{ goods_id: 7, img: '/static/img/goods/p8.jpg', name: '商品名称商品名称商品名称商品名称商品名称', price: '¥168', slogan:'1235人付款' }, { goods_id: 7, img: '/static/img/goods/p8.jpg', name: '商品名称商品名称商品名称商品名称商品名称', price: '¥168', slogan:'1235人付款' },
{ goods_id: 8, img: '/static/img/goods/p9.jpg', name: '商品名称商品名称商品名称商品名称商品名称', price: '¥168', slogan:'1235人付款' }, { goods_id: 8, img: '/static/img/goods/p9.jpg', name: '商品名称商品名称商品名称商品名称商品名称', price: '¥168', slogan:'1235人付款' },
{ goods_id: 9, img: '/static/img/goods/p10.jpg', name: '商品名称商品名称商品名称商品名称商品名称', price: '¥168', slogan:'1235人付款' } { goods_id: 9, img: '/static/img/goods/p10.jpg', name: '商品名称商品名称商品名称商品名称商品名称', price: '¥168', slogan:'1235人付款' }
], ],
loadingText:"正在加载...", loadingText:"正在加载...",
headerTop:"0px", headerTop:"0px",
headerPosition:"fixed", headerPosition:"fixed",
orderbyList:[ orderbyList:[
{text:"销量",selected:true,orderbyicon:false,orderby:0}, {text:"销量",selected:true,orderbyicon:false,orderby:0},
{text:"价格",selected:false,orderbyicon:['sheng','jiang'],orderby:0}, {text:"价格",selected:false,orderbyicon:['sheng','jiang'],orderby:0},
{text:"好评",selected:false,orderbyicon:false,orderby:0} {text:"好评",selected:false,orderbyicon:false,orderby:0}
], ],
orderby:"sheng" orderby:"sheng"
}; };
}, },
onLoad: function (option) { //optionobject onLoad: function (option) { //optionobject
console.log(option.cid); // console.log(option.cid); //
uni.setNavigationBarTitle({ uni.setNavigationBarTitle({
title: option.name title: option.name
}); });
//H5 //H5
// #ifdef H5 // #ifdef H5
//onLoadhead //onLoadhead
let Timer = setInterval(()=>{ let Timer = setInterval(()=>{
let uniHead = document.getElementsByTagName('uni-page-head'); let uniHead = document.getElementsByTagName('uni-page-head');
if(uniHead.length>0){ if(uniHead.length>0){
this.headerTop = uniHead[0].offsetHeight+'px'; this.headerTop = uniHead[0].offsetHeight+'px';
clearInterval(Timer);// clearInterval(Timer);//
} }
},1); },1);
// #endif // #endif
}, },
onPageScroll(e){ onPageScroll(e){
//iOS //iOS
if(e.scrollTop>=0){ if(e.scrollTop>=0){
this.headerPosition = "fixed"; this.headerPosition = "fixed";
}else{ }else{
this.headerPosition = "absolute"; this.headerPosition = "absolute";
} }
}, },
//page.json "enablePullDownRefresh": true //page.json "enablePullDownRefresh": true
onPullDownRefresh() { onPullDownRefresh() {
setTimeout(()=>{ setTimeout(()=>{
this.reload(); this.reload();
uni.stopPullDownRefresh(); uni.stopPullDownRefresh();
}, 1000); }, 1000);
}, },
//page.json"onReachBottomDistance" //page.json"onReachBottomDistance"
onReachBottom(){ onReachBottom(){
uni.showToast({title: '触发上拉加载'}); uni.showToast({title: '触发上拉加载'});
let len = this.goodsList.length; let len = this.goodsList.length;
if(len>=40){ if(len>=40){
this.loadingText="到底了"; this.loadingText="到底了";
return false; return false;
}else{ }else{
this.loadingText="正在加载..."; this.loadingText="正在加载...";
} }
let end_goods_id = this.goodsList[len-1].goods_id; let end_goods_id = this.goodsList[len-1].goods_id;
for(let i=1;i<=10;i++){ for(let i=1;i<=10;i++){
let goods_id = end_goods_id+i; let goods_id = end_goods_id+i;
let p = { goods_id: goods_id, img: '/static/img/goods/p'+(goods_id%10==0?10:goods_id%10)+'.jpg', name: '商品名称商品名称商品名称商品名称商品名称', price: '¥168', slogan:'1235人付款' }; let p = { goods_id: goods_id, img: '/static/img/goods/p'+(goods_id%10==0?10:goods_id%10)+'.jpg', name: '商品名称商品名称商品名称商品名称商品名称', price: '¥168', slogan:'1235人付款' };
this.goodsList.push(p); this.goodsList.push(p);
} }
}, },
methods:{ methods:{
reload(){ reload(){
console.log("reload"); console.log("reload");
let tmpArr = [] let tmpArr = []
this.goodsList = []; this.goodsList = [];
let end_goods_id = 0; let end_goods_id = 0;
for(let i=1;i<=10;i++){ for(let i=1;i<=10;i++){
let goods_id = end_goods_id+i; let goods_id = end_goods_id+i;
let p = { goods_id: goods_id, img: '/static/img/goods/p'+(goods_id%10==0?10:goods_id%10)+'.jpg', name: '商品名称商品名称商品名称商品名称商品名称', price: '¥168', slogan:'1235人付款' }; let p = { goods_id: goods_id, img: '/static/img/goods/p'+(goods_id%10==0?10:goods_id%10)+'.jpg', name: '商品名称商品名称商品名称商品名称商品名称', price: '¥168', slogan:'1235人付款' };
this.goodsList.push(p); this.goodsList.push(p);
} }
}, },
// //
toGoods(e){ toGoods(e){
uni.showToast({title: '商品'+e.goods_id,icon:"none"}); uni.showToast({title: '商品'+e.goods_id,icon:"none"});
uni.navigateTo({ uni.navigateTo({
url: '../goods' url: '../goods'
}); });
}, },
// //
select(index){ select(index){
let tmpTis = this.orderbyList[index].text+"排序 " let tmpTis = this.orderbyList[index].text+"排序 "
if(this.orderbyList[index].orderbyicon){ if(this.orderbyList[index].orderbyicon){
let type = this.orderbyList[index].orderby==0?'升序':'降序'; let type = this.orderbyList[index].orderby==0?'升序':'降序';
if(this.orderbyList[index].selected){ if(this.orderbyList[index].selected){
type = this.orderbyList[index].orderby==0?'降序':'升序'; type = this.orderbyList[index].orderby==0?'降序':'升序';
this.orderbyList[index].orderby = this.orderbyList[index].orderby==0?1:0; this.orderbyList[index].orderby = this.orderbyList[index].orderby==0?1:0;
} }
tmpTis+=type tmpTis+=type
} }
this.orderbyList[index].selected = true; this.orderbyList[index].selected = true;
let len = this.orderbyList.length; let len = this.orderbyList.length;
for(let i=0;i<len;i++){ for(let i=0;i<len;i++){
if(i!=index){ if(i!=index){
this.orderbyList[i].selected = false; this.orderbyList[i].selected = false;
} }
} }
uni.showToast({title:tmpTis,icon:"none"}); uni.showToast({title:tmpTis,icon:"none"});
} }
} }
} }
</script> </script>
<style lang="scss"> <style lang="scss">
.icon { .icon {
font-size:26upx; font-size:26upx;
}
.header{
width: 92%;
padding: 0 4%;
height: 79upx;
display: flex;
justify-content: space-around;
align-items: flex-end;
position: fixed;
top: 0;
z-index: 10;
background-color: #fff;
border-bottom: solid 1upx #eee;
.target{
width: 20%;
height: 60upx;
display: flex;
justify-content: center;
align-items: center;
font-size: 28upx;
margin-bottom: -2upx;
color: #aaa;
&.on{
color: #555;
border-bottom: 4upx solid #f06c7a;
font-weight: 600;
font-size: 30upx;
}
}
}
.place{
background-color: #ffffff;
height: 100upx;
} }
.goods-list{ .header{
.loading-text{ width: 92%;
width: 100%; padding: 0 4%;
display: flex; height: 79upx;
justify-content: center; display: flex;
align-items: center; justify-content: space-around;
height: 60upx; align-items: flex-end;
color: #979797; position: fixed;
font-size: 24upx; top: 0;
} z-index: 10;
.product-list{ background-color: #fff;
width: 92%; border-bottom: solid 1upx #eee;
padding: 0 4% 3vw 4%; .target{
display: flex; width: 20%;
justify-content: space-between; height: 60upx;
flex-wrap: wrap; display: flex;
.product{ justify-content: center;
width: 48%; align-items: center;
border-radius: 20upx; font-size: 28upx;
background-color: #fff; margin-bottom: -2upx;
margin: 0 0 15upx 0; color: #aaa;
box-shadow: 0upx 5upx 25upx rgba(0,0,0,0.1); &.on{
image{ color: #555;
width: 100%; border-bottom: 4upx solid #0083f5;
border-radius: 20upx 20upx 0 0; font-weight: 600;
} font-size: 30upx;
.name{ }
width: 92%;
padding: 8upx 4%;
display: -webkit-box; }
-webkit-box-orient: vertical; }
-webkit-line-clamp: 1; .place{
text-align: justify;
overflow: hidden; background-color: #ffffff;
font-size: 30upx; height: 100upx;
}
.info{ }
display: flex; .goods-list{
justify-content: space-between; .loading-text{
align-items: flex-end; width: 100%;
width: 92%; display: flex;
padding: 10upx 4% 10upx 4%; justify-content: center;
align-items: center;
.price{ height: 60upx;
color: #e65339; color: #979797;
font-size: 30upx; font-size: 24upx;
font-weight: 600; }
} .product-list{
.slogan{ width: 92%;
color: #807c87; padding: 0 4% 3vw 4%;
font-size: 24upx; display: flex;
} justify-content: space-between;
} flex-wrap: wrap;
} .product{
width: 48%;
} border-radius: 20upx;
background-color: #fff;
margin: 0 0 15upx 0;
box-shadow: 0upx 5upx 25upx rgba(0,0,0,0.1);
image{
width: 100%;
border-radius: 20upx 20upx 0 0;
}
.name{
width: 92%;
padding: 8upx 4%;
display: -webkit-box;
-webkit-box-orient: vertical;
-webkit-line-clamp: 1;
text-align: justify;
overflow: hidden;
font-size: 30upx;
}
.info{
display: flex;
justify-content: space-between;
align-items: flex-end;
width: 92%;
padding: 10upx 4% 10upx 4%;
.price{
color: #e65339;
font-size: 30upx;
font-weight: 600;
}
.slogan{
color: #807c87;
font-size: 24upx;
}
}
}
}
} }
</style> </style>

@ -102,9 +102,7 @@
</image> </image>
</view> </view>
</view> </view>
<!-- #ifdef H5 -->
<authorize></authorize> <authorize></authorize>
<!-- #endif -->
</view> </view>
</template> </template>
@ -981,7 +979,7 @@
} }
.buy { .buy {
background-color: #f06c7a; background-color: #0083f5;
} }
} }
} }
@ -1262,4 +1260,4 @@
} }
} }
</style> </style>

@ -1,72 +1,72 @@
<template> <template>
<view> <view>
<video id="myVideo" class="myVideo" :src="videoSrc" v-show="isPlayVideo" :show-fullscreen-btn="showFullscreenBtn" :direction="videoDirection" :show-play-btn="showPlayBtn" @pause="videoPause" @fullscreenchange="viderFullscreen"> <video id="myVideo" class="myVideo" :src="videoSrc" v-show="isPlayVideo" :show-fullscreen-btn="showFullscreenBtn" :direction="videoDirection" :show-play-btn="showPlayBtn" @pause="videoPause" @fullscreenchange="viderFullscreen">
<cover-image class="stopPlayVideoBtn" @click="stopPlayVideo" src="/static/img/close.png"></cover-image> <cover-image class="stopPlayVideoBtn" @click="stopPlayVideo" src="/static/img/close.png"></cover-image>
</video> </video>
<view class="content"> <view class="content">
<view class="label"> <view class="label">
<view v-for="(label,index) in labelList" :class="{'on':index==labelIndex}" @tap="loadRatings(index)" :key="label.type"> <view v-for="(label,index) in labelList" :class="{'on':index==labelIndex}" @tap="loadRatings(index)" :key="label.type">
{{label.name}}({{label.number}}) {{label.name}}({{label.number}})
</view> </view>
</view> </view>
<view class="list"> <view class="list">
<view class="row" v-for="(row,Rindex) in ratingsList" :key="Rindex"> <view class="row" v-for="(row,Rindex) in ratingsList" :key="Rindex">
<view class="left"> <view class="left">
<view class="face"> <view class="face">
<image :src="row.face"></image> <image :src="row.face"></image>
</view> </view>
</view> </view>
<view class="right"> <view class="right">
<view class="name-date"> <view class="name-date">
<view class="username"> <view class="username">
{{row.username}} {{row.username}}
</view> </view>
<view class="date"> <view class="date">
{{row.date}} {{row.date}}
</view> </view>
</view> </view>
<view class="spec"> <view class="spec">
{{row.spec}} {{row.spec}}
</view> </view>
<view class="first"> <view class="first">
<view class="rat"> <view class="rat">
{{row.first.content}} {{row.first.content}}
</view> </view>
<view class="img-video"> <view class="img-video">
<view class="box" v-for="item in row.first.video" @tap="playVideo(item.path)" :key="item.path"> <view class="box" v-for="item in row.first.video" @tap="playVideo(item.path)" :key="item.path">
<image mode="aspectFill" :src="item.img"></image> <image mode="aspectFill" :src="item.img"></image>
<view class="playbtn"> <view class="playbtn">
<view class="icon bofang"></view> <view class="icon bofang"></view>
</view> </view>
</view> </view>
<view class="box" v-for="item in row.first.img" @tap="showBigImg(item,row.first.img)" :key="item"> <view class="box" v-for="item in row.first.img" @tap="showBigImg(item,row.first.img)" :key="item">
<image mode="aspectFill" :src="item"></image> <image mode="aspectFill" :src="item"></image>
</view> </view>
</view> </view>
</view> </view>
<view class="append" v-if="row.append"> <view class="append" v-if="row.append">
<view class="date"> <view class="date">
{{row.append.date}}天后追加 {{row.append.date}}天后追加
</view> </view>
<view class="rat"> <view class="rat">
{{row.append.content}} {{row.append.content}}
</view> </view>
<view class="img-video"> <view class="img-video">
<view class="box" v-for="item in row.append.video" @tap="playVideo(item.path)" :key="item.path"> <view class="box" v-for="item in row.append.video" @tap="playVideo(item.path)" :key="item.path">
<image mode="aspectFill" :src="item.img"></image> <image mode="aspectFill" :src="item.img"></image>
<view class="playbtn"> <view class="playbtn">
<view class="icon bofang"></view> <view class="icon bofang"></view>
</view> </view>
</view> </view>
<view class="box" v-for="item in row.append.img" @tap="showBigImg(item,row.append.img)" :key="item"> <view class="box" v-for="item in row.append.img" @tap="showBigImg(item,row.append.img)" :key="item">
<image mode="aspectFill" :src="item"></image> <image mode="aspectFill" :src="item"></image>
</view> </view>
</view> </view>
</view> </view>
</view> </view>
</view> </view>
</view> </view>
</view> </view>
</view> </view>
</template> </template>
@ -74,315 +74,315 @@
<script> <script>
export default { export default {
data() { data() {
return { return {
labelList:[ labelList:[
{name:'全部',number:25,type:'all'}, {name:'全部',number:25,type:'all'},
{name:'好评',number:23,type:'good'}, {name:'好评',number:23,type:'good'},
{name:'中评',number:1,type:'secondary'}, {name:'中评',number:1,type:'secondary'},
{name:'差评',number:1,type:'poor'}, {name:'差评',number:1,type:'poor'},
{name:'有图',number:12,type:'img'}, {name:'有图',number:12,type:'img'},
{name:'视频',number:2,type:'video'}, {name:'视频',number:2,type:'video'},
{name:'追加',number:2,type:'append'} {name:'追加',number:2,type:'append'}
], ],
labelIndex:0, labelIndex:0,
ratingsList:[ ratingsList:[
{id:1,username:"大黑哥",face:"/static/img/face.jpg",date:'2019-04-21',spec:"规格: XL",grade:"good", {id:1,username:"大黑哥",face:"/static/img/face.jpg",date:'2019-04-21',spec:"规格: XL",grade:"good",
first:{content:"好看,可以,不愧是专业的,才拿到手上就研究了半天才装上", first:{content:"好看,可以,不愧是专业的,才拿到手上就研究了半天才装上",
img:["https://ae01.alicdn.com/kf/HTB1wREwTXzqK1RjSZFvq6AB7VXaT.jpg","https://ae01.alicdn.com/kf/HTB1sL7hTjDpK1RjSZFrq6y78VXaw.jpg","https://ae01.alicdn.com/kf/HTB111soTbvpK1RjSZPiq6zmwXXaB.jpg","https://ae01.alicdn.com/kf/HTB1O2TRTmzqK1RjSZPcq6zTepXa4.jpg"], img:["https://ae01.alicdn.com/kf/HTB1wREwTXzqK1RjSZFvq6AB7VXaT.jpg","https://ae01.alicdn.com/kf/HTB1sL7hTjDpK1RjSZFrq6y78VXaw.jpg","https://ae01.alicdn.com/kf/HTB111soTbvpK1RjSZPiq6zmwXXaB.jpg","https://ae01.alicdn.com/kf/HTB1O2TRTmzqK1RjSZPcq6zTepXa4.jpg"],
video:[{img:"https://ae01.alicdn.com/kf/HTB1AMEBTcfpK1RjSZFOq6y6nFXaK.jpg",path:"https://mp4.vjshi.com/2018-12-28/1083f3db90334f86e3fc3586b4472914.mp4"}] video:[{img:"https://ae01.alicdn.com/kf/HTB1AMEBTcfpK1RjSZFOq6y6nFXaK.jpg",path:"https://mp4.vjshi.com/2018-12-28/1083f3db90334f86e3fc3586b4472914.mp4"}]
}, },
append:{date:65,content:"用了一段时间,质量很好,体验很流畅,推荐购买", append:{date:65,content:"用了一段时间,质量很好,体验很流畅,推荐购买",
img:["https://ae01.alicdn.com/kf/HTB1dKZtTgHqK1RjSZFEq6AGMXXaS.jpg","https://ae01.alicdn.com/kf/HTB18h3oTmzqK1RjSZFjq6zlCFXap.jpg"], img:["https://ae01.alicdn.com/kf/HTB1dKZtTgHqK1RjSZFEq6AGMXXaS.jpg","https://ae01.alicdn.com/kf/HTB18h3oTmzqK1RjSZFjq6zlCFXap.jpg"],
video:[{img:"https://ae01.alicdn.com/kf/HTB1AMEBTcfpK1RjSZFOq6y6nFXaK.jpg",path:"https://mp4.vjshi.com/2017-06-17/ed1d63669bea39f5ef078c4e194291d6.mp4"}] video:[{img:"https://ae01.alicdn.com/kf/HTB1AMEBTcfpK1RjSZFOq6y6nFXaK.jpg",path:"https://mp4.vjshi.com/2017-06-17/ed1d63669bea39f5ef078c4e194291d6.mp4"}]
} }
}, },
{id:2,username:"小黑狗",face:"/static/img/face.jpg",date:'2019-04-21',spec:"规格: XL",grade:"secondary", {id:2,username:"小黑狗",face:"/static/img/face.jpg",date:'2019-04-21',spec:"规格: XL",grade:"secondary",
first:{content:"好评,看图", first:{content:"好评,看图",
img:["https://ae01.alicdn.com/kf/HTB111soTbvpK1RjSZPiq6zmwXXaB.jpg","https://ae01.alicdn.com/kf/HTB1O2TRTmzqK1RjSZPcq6zTepXa4.jpg"], img:["https://ae01.alicdn.com/kf/HTB111soTbvpK1RjSZPiq6zmwXXaB.jpg","https://ae01.alicdn.com/kf/HTB1O2TRTmzqK1RjSZPcq6zTepXa4.jpg"],
video:[] video:[]
} }
}, },
{id:3,username:"小黑狗",face:"/static/img/face.jpg",date:'2019-04-21',spec:"规格: XL",grade:"poor", {id:3,username:"小黑狗",face:"/static/img/face.jpg",date:'2019-04-21',spec:"规格: XL",grade:"poor",
first:{content:"好评,看图", first:{content:"好评,看图",
img:["https://ae01.alicdn.com/kf/HTB111soTbvpK1RjSZPiq6zmwXXaB.jpg","https://ae01.alicdn.com/kf/HTB1O2TRTmzqK1RjSZPcq6zTepXa4.jpg"], img:["https://ae01.alicdn.com/kf/HTB111soTbvpK1RjSZPiq6zmwXXaB.jpg","https://ae01.alicdn.com/kf/HTB1O2TRTmzqK1RjSZPcq6zTepXa4.jpg"],
video:[] video:[]
} }
}, },
{id:3,username:"小黑狗",face:"/static/img/face.jpg",date:'2019-04-21',spec:"规格: XL",grade:"secondary", {id:3,username:"小黑狗",face:"/static/img/face.jpg",date:'2019-04-21',spec:"规格: XL",grade:"secondary",
first:{content:"系统默认好评", first:{content:"系统默认好评",
img:[], img:[],
video:[] video:[]
} }
} }
], ],
videoDirection:0, videoDirection:0,
showFullscreenBtn:true, showFullscreenBtn:true,
showPlayBtn:true, showPlayBtn:true,
isPlayVideo:true, isPlayVideo:true,
videoSrc:'' videoSrc:''
}; };
}, },
onReady: function (res) { onReady: function (res) {
this.videoContext = uni.createVideoContext('myVideo') this.videoContext = uni.createVideoContext('myVideo')
}, },
//page.json "enablePullDownRefresh": true //page.json "enablePullDownRefresh": true
onPullDownRefresh() { onPullDownRefresh() {
setTimeout(function() { setTimeout(function() {
uni.stopPullDownRefresh(); uni.stopPullDownRefresh();
}, 1000); }, 1000);
}, },
//page.json"onReachBottomDistance" //page.json"onReachBottomDistance"
onReachBottom() { onReachBottom() {
uni.showToast({ title: '触发上拉加载' }); uni.showToast({ title: '触发上拉加载' });
}, },
methods: { methods: {
loadRatings(index){ loadRatings(index){
this.labelIndex = index; this.labelIndex = index;
uni.showToast({ uni.showToast({
title:"切换评论列表" title:"切换评论列表"
}) })
//this.ratingsList //this.ratingsList
/* /*
let type = this.labelList[index].type; // let type = this.labelList[index].type; //
...... ......
*/ */
}, },
playVideo(path) { playVideo(path) {
this.videoSrc = path; this.videoSrc = path;
// this.isPlayVideo = true; // this.isPlayVideo = true;
this.$nextTick(function() { this.$nextTick(function() {
this.videoContext.requestFullScreen({direction:0}); this.videoContext.requestFullScreen({direction:0});
}); });
}, },
stopPlayVideo(){ stopPlayVideo(){
this.videoContext.pause(); this.videoContext.pause();
}, },
videoPause(){ videoPause(){
// this.isPlayVideo = false; // this.isPlayVideo = false;
this.videoSrc = ''; this.videoSrc = '';
}, },
viderFullscreen(e){ viderFullscreen(e){
if(e.detail.fullScreen){ if(e.detail.fullScreen){
this.videoContext.play(); this.videoContext.play();
}else{ }else{
this.stopPlayVideo(); this.stopPlayVideo();
} }
}, },
showBigImg(src,srclist){ showBigImg(src,srclist){
uni.previewImage({ uni.previewImage({
current:src, current:src,
urls: srclist urls: srclist
}); });
} }
}, },
} }
</script> </script>
<style lang="scss"> <style lang="scss">
page{ page{
background-color: #fff; background-color: #fff;
} }
.myVideo{ .myVideo{
position: fixed; position: fixed;
top: 50%; top: 50%;
right: 100%; right: 100%;
} }
.content{ .content{
view{ view{
display: flex; display: flex;
} }
width: 94%; width: 94%;
padding: 0 3%; padding: 0 3%;
.label{ .label{
width: 100%; width: 100%;
flex-wrap:wrap; flex-wrap:wrap;
view{ view{
padding: 0 20upx; padding: 0 20upx;
height: 50upx; height: 50upx;
border-radius: 40upx; border-radius: 40upx;
border:solid 1upx #ddd; border:solid 1upx #ddd;
align-items: center; align-items: center;
color: #555; color: #555;
font-size: 26upx; font-size: 26upx;
background-color: #f9f9f9; background-color: #f9f9f9;
margin: 10upx 20upx 10upx 0; margin: 10upx 20upx 10upx 0;
&.on{ &.on{
border:solid 1upx #f06c7a; border:solid 1upx #0083f5;
color: #f06c7a; color: #0083f5;
} }
} }
} }
.list{ .list{
width: 100%; width: 100%;
flex-wrap: wrap; flex-wrap: wrap;
padding: 20upx 0; padding: 20upx 0;
.row{ .row{
width: 100%; width: 100%;
margin-top: 30upx; margin-top: 30upx;
.left{ .left{
width: 10vw; width: 10vw;
flex-shrink: 0; flex-shrink: 0;
margin-right: 10upx; margin-right: 10upx;
.face{ .face{
width: 100%; width: 100%;
image{ image{
width: 10vw; width: 10vw;
height: 10vw; height: 10vw;
border-radius: 100%; border-radius: 100%;
} }
} }
} }
.right{ .right{
width: 100%; width: 100%;
flex-wrap: wrap; flex-wrap: wrap;
.name-date{ .name-date{
width: 100%; width: 100%;
justify-content: space-between; justify-content: space-between;
align-items: baseline; align-items: baseline;
.username{ .username{
font-size: 32upx; font-size: 32upx;
color: #555; color: #555;
} }
.date{ .date{
font-size:28upx; font-size:28upx;
color: #aaa; color: #aaa;
} }
} }
.spec{ .spec{
width: 100%; width: 100%;
color: #aaa; color: #aaa;
font-size: 26upx; font-size: 26upx;
} }
.first{ .first{
width: 100%; width: 100%;
flex-wrap: wrap; flex-wrap: wrap;
.rat{ .rat{
font-size: 30upx; font-size: 30upx;
} }
.img-video{ .img-video{
width: 100%; width: 100%;
flex-wrap: wrap; flex-wrap: wrap;
.box{ .box{
width: calc((84.6vw - 50upx)/4); width: calc((84.6vw - 50upx)/4);
height: calc((84.6vw - 50upx)/4); height: calc((84.6vw - 50upx)/4);
margin: 5upx 5upx; margin: 5upx 5upx;
position: relative; position: relative;
justify-content: center; justify-content: center;
align-items: center; align-items: center;
image{ image{
position: absolute; position: absolute;
width: 100%; width: 100%;
height: 100%; height: 100%;
border-radius: 10upx; border-radius: 10upx;
} }
.playbtn{ .playbtn{
position: absolute; position: absolute;
.icon{ .icon{
font-size: 80upx; font-size: 80upx;
color: rgba(255,255,255,.9) color: rgba(255,255,255,.9)
} }
} }
} }
} }
} }
.append{ .append{
width: 100%; width: 100%;
flex-wrap: wrap; flex-wrap: wrap;
.date{ .date{
width: 100%; width: 100%;
height: 40upx; height: 40upx;
border-left: 10upx solid #f06c7a; border-left: 10upx solid #0083f5;
padding-left: 10upx; padding-left: 10upx;
align-items: center; align-items: center;
font-size: 32upx; font-size: 32upx;
margin: 20upx 0; margin: 20upx 0;
} }
.rat{ .rat{
font-size: 30upx; font-size: 30upx;
} }
.img-video{ .img-video{
width: 100%; width: 100%;
flex-wrap: wrap; flex-wrap: wrap;
.box{ .box{
width: calc((84.6vw - 10upx - (10upx * 4))/4); width: calc((84.6vw - 10upx - (10upx * 4))/4);
height: calc((84.6vw - 10upx - (10upx * 4))/4); height: calc((84.6vw - 10upx - (10upx * 4))/4);
margin: 5upx 5upx; margin: 5upx 5upx;
position: relative; position: relative;
justify-content: center; justify-content: center;
align-items: center; align-items: center;
image{ image{
position: absolute; position: absolute;
width: 100%; width: 100%;
height: 100%; height: 100%;
border-radius: 10upx; border-radius: 10upx;
} }
.playbtn{ .playbtn{
position: absolute; position: absolute;
.icon{ .icon{
font-size: 80upx; font-size: 80upx;
color: rgba(255,255,255,.9); color: rgba(255,255,255,.9);
} }
} }
} }
} }
} }
} }
} }
} }
} }
/* /*
* <view class="list"> * <view class="list">
<view class="row"> <view class="row">
<view class="right"> <view class="right">
<view class="spec"> <view class="spec">
规格XL 规格XL
</view> </view>
<view class="first"> <view class="first">
<view class="rat"> <view class="rat">
好看可以不愧是专业的才拿到手上就研究了半天才装上 好看可以不愧是专业的才拿到手上就研究了半天才装上
</view> </view>
<view class="img-video"> <view class="img-video">
<view class="box"> <view class="box">
<image src="https://ae01.alicdn.com/kf/HTB1wREwTXzqK1RjSZFvq6AB7VXaT.jpg"></image> <image src="https://ae01.alicdn.com/kf/HTB1wREwTXzqK1RjSZFvq6AB7VXaT.jpg"></image>
<view class="playbtn"> <view class="playbtn">
<view class="icon bofang"></view> <view class="icon bofang"></view>
</view> </view>
</view> </view>
<view class="box"> <view class="box">
<image src="https://ae01.alicdn.com/kf/HTB1wREwTXzqK1RjSZFvq6AB7VXaT.jpg"></image> <image src="https://ae01.alicdn.com/kf/HTB1wREwTXzqK1RjSZFvq6AB7VXaT.jpg"></image>
</view> </view>
<view class="box"> <view class="box">
<image src="https://ae01.alicdn.com/kf/HTB1wREwTXzqK1RjSZFvq6AB7VXaT.jpg"></image> <image src="https://ae01.alicdn.com/kf/HTB1wREwTXzqK1RjSZFvq6AB7VXaT.jpg"></image>
</view> </view>
</view> </view>
</view> </view>
<view class="append"> <view class="append">
<view class="date"> <view class="date">
65天后追加 65天后追加
</view> </view>
<view class="rat"> <view class="rat">
好看可以不愧是专业的才拿到手上就研究了半天才装上 好看可以不愧是专业的才拿到手上就研究了半天才装上
</view> </view>
<view class="img-video"> <view class="img-video">
<view class="box"> <view class="box">
<image src="https://ae01.alicdn.com/kf/HTB1wREwTXzqK1RjSZFvq6AB7VXaT.jpg"></image> <image src="https://ae01.alicdn.com/kf/HTB1wREwTXzqK1RjSZFvq6AB7VXaT.jpg"></image>
</view> </view>
<view class="box"> <view class="box">
<image src="https://ae01.alicdn.com/kf/HTB1wREwTXzqK1RjSZFvq6AB7VXaT.jpg"></image> <image src="https://ae01.alicdn.com/kf/HTB1wREwTXzqK1RjSZFvq6AB7VXaT.jpg"></image>
</view> </view>
</view> </view>
</view> </view>
</view> </view>
</view> </view>
</view> </view>
* *
* */ * */
</style> </style>

@ -1,13 +1,13 @@
<template> <template>
<view> <view>
<!-- 头部 --> <!-- 头部 -->
<view class="width100 height120 backcorfff"> <view class="width100 height120 backcorfff">
<image src="../../../static/img/noorder.png" class="flleft conImg mart10 margle10"></image> <image :src="orderList.goodsImg" class="flleft conImg mart10 margle10"></image>
<view class="conCont paddtop15"> <view class="conCont paddtop15">
<view class="font20 fontwig6 fcor333 text1 paddtright10">乌江能源加油站(大一型国企)</view> <view class="font20 fontwig6 fcor333 text1 paddtright10">{{orderList.goodsName}}</view>
<view class="font14 fcor999 text2 paddtop5 paddtright10">贵州省贵阳市什么什么大道65号</view> <view class="font14 fcor999 text2 paddtop5 paddtright10">{{refulAdress}}</view>
<view class="font20 fontwig6 fcoreb5 paddtop5">6.40 <view class="font20 fontwig6 fcoreb5 paddtop5">{{orderList.gasPriceVip}}
<text class="margle10 slogan font14">6.38</text> <text class="margle10 slogan font14">{{orderList.gasPriceGun}}</text>
</view> </view>
</view> </view>
</view> </view>
@ -19,7 +19,7 @@
油号\油枪 油号\油枪
</view> </view>
<view class="flright width40 fotct"> <view class="flright width40 fotct">
92#/2 {{orderList.gasOilNo}}#/{{orderList.gasGunNo}}
</view> </view>
</view> </view>
<view class="line1"></view> <view class="line1"></view>
@ -28,32 +28,171 @@
加油金额 加油金额
</view> </view>
<view class="flright width40 fotct"> <view class="flright width40 fotct">
500 {{orderList.totalPrice}}
</view> </view>
</view> </view>
<view class="width100 mart15 fcor333 font16 fontwig6 paddleft10">重要说明</view> <view class="width100 mart15 fcor333 font16 fontwig6 paddleft10">重要说明</view>
<view class="width95 paddleft10 font14 fcor999 mart5">1.<text class="fcor089 fontwig6">请先加油后下单</text>,即您到站后,与工作人员确认油号,抢号后再付款</view> <view class="width95 paddleft10 font14 fcor999 mart5">1.<text
<view class="width95 paddleft10 font14 fcor999 mart5">2.请勿先付款后加油,若您已下单付款请于24小时内到加油站完成加油;若您48小时内未完成加油,请及时发起退单;逾期退单可能会退单失败</view> class="fcor089 fontwig6">请先加油后下单</text>,即您到站后,与工作人员确认油号,抢号后再付款</view>
<view class="width95 paddleft10 font14 fcor999 mart5">
2.请勿先付款后加油,若您已下单付款请于24小时内到加油站完成加油;若您48小时内未完成加油,请及时发起退单;逾期退单可能会退单失败</view>
<!-- 底部按钮 --> <!-- 底部按钮 -->
<view class="footer"> <view class="footer">
<view class="width50 flleft fcoreb5 padleft15 font15"> <view class="width50 flleft fcoreb5 padleft15 font15">
合计: <text class="font24">0.00</text> 合计: <text class="font24">{{payprice}}</text>
</view> </view>
<button class="reBtn flright">去支付</button> <button class="reBtn flright" @click="orderToPay">去支付</button>
</view> </view>
</view> </view>
</template> </template>
<script> <script>
import {
getOrderById,
orderToPay
} from '../../../Utils/Api.js';
let app = getApp();
// #ifdef H5
var jweixin = require('jweixin-module');
// #endif
export default { export default {
data() { data() {
return { return {
orderNo: '',
couponId: '',
payprice: '',
orderList: '',
refulAdress: ''
} }
}, },
onLoad(e) {
this.payprice = e.payprice;
this.orderNo = e.orderId;
this.couponId = e.couponId;
this.refulAdress = e.adres;
this.getOrderById();
},
methods: { methods: {
getOrderById() {
uni.showLoading({
title: '加载中...'
})
let params = {
orderId: this.orderNo,
}
getOrderById(params).then(res => {
uni.hideLoading();
if (res.return_code == '000000') {
this.orderList = res.return_data.highChildOrderList[0];
}
})
},
//
orderToPay() {
let that = this;
let params = {
"orderId": that.orderNo,
"openId": app.globalData.openId,
"orderScene": "GOODS_ORDER"
}
orderToPay(params).then(res => {
if (res.return_code == '000000') {
// #ifdef MP
uni.showLoading({
title: '支付中...'
})
uni.requestPayment({
"appId": res.return_data.appId,
"nonceStr": res.return_data.nonceStr,
"package": res.return_data.package,
"paySign": res.return_data.sign,
"signType": "MD5",
"timeStamp": res.return_data.timeStamp,
success: function(res) {
uni.hideLoading();
uni.showToast({
title: '支付成功'
})
uni.reLaunch({
url: '/pages/goods/refuel-succes/refuel-succes?id=' + that
.orderNo
});
},
fail: function(err) {
uni.hideLoading();
},
});
// #endif
//
// #ifdef H5
//
that.payRequest(res);
// #endif
} else {
uni.showToast({
title: res.return_msg,
icon: 'none'
})
}
})
},
payRequest: function(self) {
uni.showLoading({
title: '支付中...'
})
jweixin.config({
// debug: true, // ,apialertpclogpc
appId: self.return_data.appId, //
timestamp: self.return_data.timeStamp, //
nonceStr: self.return_data.nonceStr, //
signature: self.return_data.sign, // 1
jsApiList: ['chooseWXPay'] // 使JSJS2
});
uni.hideLoading();
jweixin.ready(function() {
jweixin.checkJsApi({
jsApiList: ['chooseWXPay'], // JSJS2,
success: function(res) {},
fail: function(res) {}
});
jweixin.chooseWXPay({
appId: self.return_data.appId,
timestamp: self.return_data
.timeStamp, // jssdk使timestamp使timeStampS
nonceStr: self.return_data.nonceStr, // 32
package: self.return_data
.package, // prepay_idprepay_id=***
signType: 'MD5', // 'SHA1'使'MD5'
paySign: self.return_data.sign, //
success: function(res) {
//
uni.showToast({
title: '支付成功'
})
uni.reLaunch({
url: '/pages/goods/refuel-succes/refuel-succes?id=' + that
.orderNo
});
},
cancel: function(r) {},
fail: function(res) {}
});
});
jweixin.error(function(res) {
uni.showToast({
icon: 'none',
title: '支付失败了',
duration: 4000
});
// configerrorconfigdebugresSPA
/*alert("config信息验证失败");*/
});
},
} }
} }
</script> </script>
@ -62,18 +201,22 @@
page { page {
background-color: #f7f7f7; background-color: #f7f7f7;
} }
.conImg{
.conImg {
width: 100px; width: 100px;
height: 100px; height: 100px;
border-radius: 8px; border-radius: 8px;
} }
.conCont{
.conCont {
margin-left: 115px; margin-left: 115px;
} }
.slogan { .slogan {
color: #807c87; color: #807c87;
text-decoration: line-through; text-decoration: line-through;
} }
.footer { .footer {
position: fixed; position: fixed;
bottom: 0upx; bottom: 0upx;
@ -86,7 +229,8 @@
display: flex; display: flex;
justify-content: space-between; justify-content: space-between;
align-items: center; align-items: center;
.reBtn{
.reBtn {
width: 110px; width: 110px;
background-color: #089bf5; background-color: #089bf5;
color: #FFFFFF; color: #FFFFFF;

@ -7,7 +7,7 @@
<view class="width100 text1 font18 fontwig6 fcor333">{{storeList.gasName}}</view> <view class="width100 text1 font18 fontwig6 fcor333">{{storeList.gasName}}</view>
<view class="width100 font14 fcor666 mart5">{{storeList.gasAddress}}</view> <view class="width100 font14 fcor666 mart5">{{storeList.gasAddress}}</view>
</view> </view>
<view class="flright reimg fotct width20"> <view class="flright reimg fotct width20" @click="seeloaction">
<image mode="widthFix" src="../../../static/img/dhl.png"></image> <image mode="widthFix" src="../../../static/img/dhl.png"></image>
<view class="fcor089">{{storeList.distance}}km</view> <view class="fcor089">{{storeList.distance}}km</view>
</view> </view>
@ -65,15 +65,16 @@
<view class="width90 mart15 font16 fcor666">加油金额</view> <view class="width90 mart15 font16 fcor666">加油金额</view>
<view class="width90 height40 mart10" style="border: 1px solid #f2f2f2;"> <view class="width90 height40 mart10" style="border: 1px solid #f2f2f2;">
<view class="width8 flleft"></view> <view class="width8 flleft"></view>
<input type="number" class="font16 width70 flleft height40" placeholder="请输入金额" v-model="inputPhone" /> <input type="number" class="font16 width60 flleft height40" placeholder="请输入金额" v-model="inputMoney"
<view class="width20 height40 flright font14 fcor999 fotct" @blur="Listeningfocus" maxlength="5" />
<view class="width30 height40 flright font14 fcor999 fotct"
style="border-left: 1px solid #f2f2f2;line-height: 40px;"> style="border-left: 1px solid #f2f2f2;line-height: 40px;">
0.01L {{litre}}L
</view> </view>
</view> </view>
<view class="list width90"> <view class="list width90">
<view class="box" v-for="(amount,index) in amountList" :key="index" @click="select(amount)" <view class="box" v-for="(amount,index) in amountList" :key="index" @click="select(amount)"
:class="{'on':amount.id == inputAmount}"> :class="{'on':amount.price == inputMoney}">
<view class="heTitle fcor333" :class="{'fcor089':amount.id == inputAmount}">{{amount.price}}</view> <view class="heTitle fcor333" :class="{'fcor089':amount.id == inputAmount}">{{amount.price}}</view>
</view> </view>
</view> </view>
@ -81,9 +82,19 @@
<!-- 底部按钮 --> <!-- 底部按钮 -->
<view class="footer"> <view class="footer">
<view class="width50 flleft fcor666 padleft15 font15"> <view class="width50 flleft fcor666 padleft15 font15">
合计: <text class="font24">0.00</text> 合计: <text class="font24">{{totalPrice}}</text>
</view> </view>
<button class="reBtn flright">去支付</button>
<!-- #ifdef MP -->
<button class="reBtn flright" open-type="getPhoneNumber" v-if="user.phone == null"
@getphonenumber="getPhoneNumber">去支付</button>
<button class="reBtn flright" v-else @click="toPay">去支付</button>
<!-- #endif -->
<!-- #ifdef H5 -->
<button class="reBtn flright" v-if="user.phone == null" @click="jumpH5Bding">去支付</button>
<button class="reBtn flright" v-else @click="toPay">去支付</button>
<!-- #endif -->
</view> </view>
<!-- 底部弹窗 --> <!-- 底部弹窗 -->
<wybPopup ref="popup" type="bottom" height="600" width="500" radius="6" :showCloseIcon="true"> <wybPopup ref="popup" type="bottom" height="600" width="500" radius="6" :showCloseIcon="true">
@ -110,7 +121,8 @@
<script> <script>
import { import {
getGasDetailByStoreKey getGasDetailByStoreKey,
addOrder
} from '../../../Utils/Api.js'; } from '../../../Utils/Api.js';
import wybPopup from '../../../components/wyb-popup/wyb-popup.vue'; import wybPopup from '../../../components/wyb-popup/wyb-popup.vue';
let app = getApp(); let app = getApp();
@ -122,6 +134,7 @@
return { return {
detailList: [], detailList: [],
gunnumber: [], gunnumber: [],
user: '',
amountList: [{ amountList: [{
id: '1', id: '1',
price: '200' price: '200'
@ -147,18 +160,36 @@
priceOfficial: '', priceOfficial: '',
priceGun: '', priceGun: '',
gunNo: '', gunNo: '',
typeId: '' typeId: '',
counId: '',
inputMoney: '',
gasOilNo: '',
litre: '',
totalPrice: '0.00'
} }
}, },
onLoad(options) { onLoad(options) {
this.store_key = options.id; this.store_key = options.id;
this.counId = options.desId;
this.getGasDetailByStoreKey(); this.getGasDetailByStoreKey();
}, },
onShow() {
this.user = app.globalData.userInfo;
},
methods: { methods: {
//
seeloaction() {
uni.openLocation({
latitude: Number(this.storeList.gasAddressLatitude), //
longitude: Number(this.storeList.gasAddressLongitude), //
name: this.storeList.gasName,
address: this.storeList.gasAddress
})
},
// //
showPopup(item) { showPopup(item) {
this.$refs.popup.show();
this.typeId = item; this.typeId = item;
this.$refs.popup.show();
}, },
// //
getGasDetailByStoreKey() { getGasDetailByStoreKey() {
@ -182,7 +213,8 @@
this.gunnumber = res.return_data.gasGunList; this.gunnumber = res.return_data.gasGunList;
for (var i = 0; i < res.return_data.gasGunList.length; i++) { for (var i = 0; i < res.return_data.gasGunList.length; i++) {
if (this.oilNo == res.return_data.gasGunList[i].oilNoName) { if (this.oilNo == res.return_data.gasGunList[i].oilNoName) {
this.gunNo = res.return_data.gasGunList[i].gunNo this.gunNo = res.return_data.gasGunList[i].gunNo;
this.gasOilNo = res.return_data.gasGunList[i].oilNo;
} }
} }
@ -193,6 +225,7 @@
// //
changeValue(item) { changeValue(item) {
this.oilNo = item.oilNoName; this.oilNo = item.oilNoName;
this.gasOilNo = item.oilNo;
this.priceVip = item.priceVip; this.priceVip = item.priceVip;
this.priceOfficial = item.priceOfficial; this.priceOfficial = item.priceOfficial;
this.priceGun = item.priceGun; this.priceGun = item.priceGun;
@ -204,7 +237,80 @@
this.$refs.popup.hide(); this.$refs.popup.hide();
}, },
select(amount) { select(amount) {
this.inputAmount = amount.id; this.inputMoney = amount.price;
this.litre = parseFloat(amount.price / this.priceGun).toFixed(2);
this.totalPrice = parseFloat(amount.price / this.priceGun * this.priceVip).toFixed(2);
},
//
getPhoneNumber(PhoneNumber) {
let params = {
openId: app.globalData.openId,
iv: PhoneNumber.detail.iv,
encryptedData: PhoneNumber.detail.encryptedData
}
GetPhoneNumber(params).then(res => {
if (res.return_code == '000000') {
app.globalData.userInfo = res.return_data
.object
.highUser;
uni.setStorage({
key: "user",
data: res.return_data
.object
.highUser
})
let that = this;
that.toPay();
}
});
},
// H5
jumpH5Bding() {
uni.navigateTo({
url: '/pages/login/register?id=2'
})
},
//
Listeningfocus() {
this.litre = parseFloat(this.inputMoney / this.priceGun).toFixed(2);
this.totalPrice = parseFloat(this.inputMoney / this.priceGun * this.priceVip).toFixed(2);
},
toPay() {
if (this.inputMoney == '' || this.inputMoney < 1) {
uni.showToast({
title: '请输入正确金额',
icon: "none"
});
return false;
}
uni.showLoading({
title: '提交订单中...'
})
let goods = {
"highChildOrderList": [{
"goodsType": 3,
"goodsId": this.counId,
"saleCount": 1,
"goodsPrice": this.inputMoney,
"gasGunNo": this.gunNo,
"gasOilNo": this.gasOilNo
}]
}
addOrder(goods).then(res => {
uni.hideLoading();
if (res.return_code == '000000') {
uni.redirectTo({
url: '/pages/goods/refuel-confirm/refuel-confirm?payprice=' + res.return_data.payPrice + '&orderId=' + res.return_data.id + '&couponId=' + this.counId+'&adres='+this.storeList.gasAddress
})
} else {
uni.showToast({
title: res.return_msg,
icon: 'none',
duration: 2000
});
}
})
}, },
} }
} }

@ -4,7 +4,7 @@
<image class="imageIcon mart15" src="../../../static/img/succes.png"></image> <image class="imageIcon mart15" src="../../../static/img/succes.png"></image>
<view class="fcorfff font15 mart10">已支付</view> <view class="fcorfff font15 mart10">已支付</view>
<view class="fcor333 font24 width90 height55 backcorfff mart20 fotct fontwig6"> <view class="fcor333 font24 width90 height55 backcorfff mart20 fotct fontwig6">
<text class="font15"></text>499.27 <text class="font15"></text>{{orderInfo.payPrice}}
</view> </view>
<view class="width90 height25"> <view class="width90 height25">
<image class="width100 height25" style="height: 17px;" src="../../../static/img/suline1.png"></image> <image class="width100 height25" style="height: 17px;" src="../../../static/img/suline1.png"></image>
@ -20,7 +20,7 @@
<text class="paddleft10">交易单号</text> <text class="paddleft10">交易单号</text>
</view> </view>
<view class="width70 flright text1 fotrt"> <view class="width70 flright text1 fotrt">
<text class="paddtright10">342342342433</text> <text class="paddtright10">{{orderInfo.orderNo}}</text>
</view> </view>
</view> </view>
@ -29,7 +29,7 @@
<text class="paddleft10">油站名称</text> <text class="paddleft10">油站名称</text>
</view> </view>
<view class="width70 flright text1 fotrt"> <view class="width70 flright text1 fotrt">
<text class="paddtright10">发生发生范德萨发</text> <text class="paddtright10">{{orderInfo.highChildOrderList[0].goodsName}}</text>
</view> </view>
</view> </view>
@ -38,7 +38,7 @@
<text class="paddleft10">下单时间</text> <text class="paddleft10">下单时间</text>
</view> </view>
<view class="width70 flright text1 fotrt"> <view class="width70 flright text1 fotrt">
<text class="paddtright10">2021-02-23 12:23:34</text> <text class="paddtright10">{{orderInfo.createTime | formatDate('-')}}</text>
</view> </view>
</view> </view>
@ -47,7 +47,7 @@
<text class="paddleft10">支付时间</text> <text class="paddleft10">支付时间</text>
</view> </view>
<view class="width70 flright text1 fotrt"> <view class="width70 flright text1 fotrt">
<text class="paddtright10">2021-02-23 12:23:34</text> <text class="paddtright10">{{orderInfo.payTime | formatDate('-')}}</text>
</view> </view>
</view> </view>
@ -56,7 +56,7 @@
<text class="paddleft10">加油金额</text> <text class="paddleft10">加油金额</text>
</view> </view>
<view class="width70 flright text1 fotrt"> <view class="width70 flright text1 fotrt">
<text class="paddtright10">500.00</text> <text class="paddtright10">{{orderInfo.totalPrice}}</text>
</view> </view>
</view> </view>
@ -65,7 +65,7 @@
<text class="paddleft10">立即优惠</text> <text class="paddleft10">立即优惠</text>
</view> </view>
<view class="width70 flright text1 fotrt"> <view class="width70 flright text1 fotrt">
<text class="paddtright10">0.73</text> <text class="paddtright10">{{orderInfo.deductionPrice}}</text>
</view> </view>
</view> </view>
<view class="width90 font13 fcor999 mart10"> <view class="width90 font13 fcor999 mart10">
@ -75,14 +75,53 @@
</template> </template>
<script> <script>
import {
getOrderById
} from '../../../Utils/Api.js';
export default { export default {
data() { data() {
return { return {
orderInfo: '',
orderNo : ''
}
},
filters: {
//
formatDate: function(value, spe = '/') {
let data = new Date(value);
let year = data.getFullYear();
let month = data.getMonth() + 1;
let day = data.getDate();
let h = data.getHours();
let mm = data.getMinutes();
let s = data.getSeconds();
month = month >= 10 ? month : "0" + month;
day = day >= 10 ? day : "0" + day;
h = h >= 10 ? h : "0" + h;
mm = mm >= 10 ? mm : "0" + mm;
s = s >= 10 ? s : "0" + s;
return `${year}${spe}${month}${spe}${day} ${h}:${mm}:${s}`;
} }
}, },
onLoad(options) {
this.orderNo = options.id;
this.getOrderById();
},
methods: { methods: {
getOrderById() {
uni.showLoading({
title: '加载中...'
})
let params = {
orderId: this.orderNo
}
getOrderById(params).then(res => {
uni.hideLoading();
if (res.return_code == '000000') {
this.orderInfo = res.return_data;
}
})
},
} }
} }
</script> </script>

File diff suppressed because one or more lines are too long

@ -107,7 +107,7 @@
是否使用优惠券 是否使用优惠券
</view> </view>
<view class="content"> <view class="content">
<switch color="#f06c7a" @change="switch2Change" checked="true" /> <switch color="#0083f5" @change="switch2Change" checked="true" />
</view> </view>
</view> </view>
@ -117,7 +117,7 @@
<view class="row" v-for="(item, index) in UserNormalDiscountList" :key="item.value"> <view class="row" v-for="(item, index) in UserNormalDiscountList" :key="item.value">
<!-- 商品 --> <!-- 商品 -->
<view class="carrier"> <view class="carrier">
<radio color="#f06c7a" :value="item.highDiscount.id" :checked="index === current" /> <radio color="#0083f5" :value="item.highDiscount.id" :checked="index === current" />
<!-- 商品信息 --> <!-- 商品信息 -->
<view class="goods-info"> <view class="goods-info">
<view class="img"> <view class="img">
@ -481,7 +481,7 @@
height: 40upx; height: 40upx;
.price { .price {
color: #f06c7a; color: #0083f5;
width: 30%; width: 30%;
} }
@ -553,7 +553,7 @@
justify-content: flex-end; justify-content: flex-end;
.money { .money {
color: #f06c7a; color: #0083f5;
font-weight: 600; font-weight: 600;
} }
} }
@ -561,7 +561,7 @@
.btn { .btn {
padding: 0 30upx; padding: 0 30upx;
height: 60upx; height: 60upx;
background-color: #f06c7a; background-color: #0083f5;
color: #fff; color: #fff;
display: flex; display: flex;
justify-content: center; justify-content: center;
@ -591,7 +591,7 @@
.content { .content {
font-size: 26upx; font-size: 26upx;
color: #f06c7a; color: #0083f5;
} }
} }
} }
@ -721,4 +721,4 @@
} }
} }
} }
</style> </style>

@ -32,7 +32,7 @@
金币支付 金币支付
</view> </view>
<view class="right"> <view class="right">
<radio :checked="paytype=='jinbi'" color="#f06c7a" /> <radio :checked="paytype=='jinbi'" color="#0083f5" />
</view> </view>
</view> </view>
<view class="row" @tap="paytype='wxpay'" v-if="pryType == 1 || pryType==3 "> <view class="row" @tap="paytype='wxpay'" v-if="pryType == 1 || pryType==3 ">
@ -43,7 +43,7 @@
微信支付 微信支付
</view> </view>
<view class="right"> <view class="right">
<radio :checked="paytype=='wxpay'" color="#f06c7a" /> <radio :checked="paytype=='wxpay'" color="#0083f5" />
</view> </view>
</view> </view>
</view> </view>
@ -350,7 +350,7 @@
justify-content: center; justify-content: center;
align-items: center; align-items: center;
color: #fff; color: #fff;
background-color: #f06c7a; background-color: #0083f5;
box-shadow: 0upx 5upx 10upx rgba(0, 0, 0, 0.2); box-shadow: 0upx 5upx 10upx rgba(0, 0, 0, 0.2);
} }
@ -368,4 +368,4 @@
} }
} }
} }
</style> </style>

@ -312,7 +312,7 @@
width: 35upx; width: 35upx;
height: 35upx; height: 35upx;
border-radius: 100%; border-radius: 100%;
border: solid 2upx #f06c7a; border: solid 2upx #0083f5;
display: flex; display: flex;
justify-content: center; justify-content: center;
align-items: center; align-items: center;
@ -320,7 +320,7 @@
width: 25upx; width: 25upx;
height: 25upx; height: 25upx;
border-radius: 100%; border-radius: 100%;
background-color: #f06c7a; background-color: #0083f5;
} }
} }
.text{ .text{
@ -542,8 +542,8 @@
bottom: 0upx; bottom: 0upx;
z-index: 5; z-index: 5;
.delBtn{ .delBtn{
border: solid 1upx #f06c7a; border: solid 1upx #0083f5;
color: #f06c7a; color: #0083f5;
padding: 0 30upx; padding: 0 30upx;
height: 50upx; height: 50upx;
border-radius: 30upx; border-radius: 30upx;
@ -569,7 +569,7 @@
.btn{ .btn{
padding: 0 30upx; padding: 0 30upx;
height: 50upx; height: 50upx;
background-color: #f06c7a; background-color: #0083f5;
color: #fff; color: #fff;
display: flex; display: flex;
justify-content: center; justify-content: center;
@ -579,4 +579,4 @@
} }
} }
} }
</style> </style>

@ -3,8 +3,9 @@
<!-- 状态栏 --> <!-- 状态栏 -->
<view class="status" :style="{position:headerPosition}"></view> <view class="status" :style="{position:headerPosition}"></view>
<view class="header" :style="{position:headerPosition}"> <view class="header" :style="{position:headerPosition}">
<view class="addr"> <view class="addr" @click="goPostion">
<view class="icon location"></view>{{city}} <!-- <view class="icon location"></view> -->
{{city}}<image mode="widthFix" style="width: 15px;" src="../../../static/img/jt.png"></image>
</view> </view>
<view class="input-box"> <view class="input-box">
<input placeholder="搜索卡券" placeholder-style="color:#c0c0c0;" @tap="toSearch()" /> <input placeholder="搜索卡券" placeholder-style="color:#c0c0c0;" @tap="toSearch()" />
@ -91,15 +92,20 @@
} }
}, },
onLoad() { onLoad() {
this.postionIng();
}, },
onShow() {
this.categoryList = [];
this.MerchantList = [];
if (app.globalData.cityName != '') {
this.city = app.globalData.cityName;
this.getMerchantList();
}else{
this.postionIng();
}
},
methods: { methods: {
postionIng() { postionIng() {
uni.showLoading({
title: '加载中'
})
let that = this; let that = this;
uni.getLocation({ uni.getLocation({
type: 'wgs84', type: 'wgs84',
@ -120,7 +126,6 @@
app.globalData.cityId = res.data.result.ad_info.adcode; app.globalData.cityId = res.data.result.ad_info.adcode;
// app.globalData.cityId = '500100'; // app.globalData.cityId = '500100';
that.getMerchantList(); that.getMerchantList();
uni.hideLoading()
} }
}) })
// #endif // #endif
@ -142,31 +147,28 @@
''); '');
app.globalData.cityId = res.result.ad_info.adcode; app.globalData.cityId = res.result.ad_info.adcode;
vm.getMerchantList(); vm.getMerchantList();
uni.hideLoading()
}) })
.catch(err => { .catch(err => {
uni.hideLoading()
console.log(err); console.log(err);
}); });
}, },
// //
getMerchantList() { getMerchantList() {
uni.showLoading({
title: '加载中...'
})
let params = { let params = {
regionId: app.globalData.cityId regionId: app.globalData.cityId
} }
getMerchantList(params).then(res => { getMerchantList(params).then(res => {
if (res.return_code == '000000') { if (res.return_code == '000000' && res.return_data !='') {
this.MerchantList = res.return_data; this.MerchantList = res.return_data;
this.getStoreListByMerchant(res.return_data[0].id); this.getStoreListByMerchant(res.return_data[0].id);
setTimeout(function() {
uni.hideLoading();
}, 2000);
} else { } else {
uni.hideLoading() this.MerchantList = [];
uni.showToast({
title: '暂无数据',
icon: 'none',
duration: 2000
})
} }
}) })
}, },
@ -189,6 +191,12 @@
}); });
}, },
//
goPostion() {
uni.navigateTo({
url: '/pages/user/positioning/positioning'
})
},
// //
getStoreListByMerchant(item) { getStoreListByMerchant(item) {
uni.showLoading({ uni.showLoading({
@ -201,14 +209,11 @@
latitude: app.globalData.latitude latitude: app.globalData.latitude
} }
getStoreListByMerchant(params).then(res => { getStoreListByMerchant(params).then(res => {
uni.hideLoading();
if (res.return_code == '000000') { if (res.return_code == '000000') {
this.categoryList = res.return_data this.categoryList = res.return_data
setTimeout(function() {
uni.hideLoading();
}, 2000);
} else { } else {
this.categoryList = []; this.categoryList = [];
uni.hideLoading()
} }
}) })
@ -272,7 +277,7 @@
position: fixed; position: fixed;
top: 0; top: 0;
z-index: 10; z-index: 10;
background-color: #fff; background-color: #0083f5;
/* #ifdef APP-PLUS */ /* #ifdef APP-PLUS */
top: var(--status-bar-height); top: var(--status-bar-height);
/* #endif */ /* #endif */
@ -281,10 +286,10 @@
width: 120upx; width: 120upx;
height: 60upx; height: 60upx;
flex-shrink: 0; flex-shrink: 0;
color: #FFFFFF;
display: flex; display: flex;
align-items: center; align-items: center;
font-size: 28upx; font-size: 28upx;
.icon { .icon {
height: 60upx; height: 60upx;
margin-right: 5upx; margin-right: 5upx;
@ -297,9 +302,9 @@
.input-box { .input-box {
width: 100%; width: 100%;
height: 60upx; height: 70rpx;
background-color: #f5f5f5; background-color: #f5f5f5;
border-radius: 30upx; border-radius: 10rpx;
position: relative; position: relative;
display: flex; display: flex;
align-items: center; align-items: center;
@ -406,7 +411,7 @@
width: 10upx; width: 10upx;
height: 80%; height: 80%;
top: 10%; top: 10%;
background-color: #f06c7a; background-color: #0083f5;
} }
} }
} }
@ -465,4 +470,4 @@
} }
} }
} }
</style> </style>

@ -8,8 +8,8 @@
:style="{ position: headerPosition,top:headerTop,opacity: afterHeaderOpacity }"> :style="{ position: headerPosition,top:headerTop,opacity: afterHeaderOpacity }">
<!-- 定位城市 --> <!-- 定位城市 -->
<view class="addr" @click="goPostion"> <view class="addr" @click="goPostion">
<view class="icon location"></view> <!-- <view class="icon location"></view> -->
{{ city }} {{ city }} <image mode="widthFix" style="width: 15px;" src="../../../static/img/jt.png"></image>
</view> </view>
<!-- 搜索框 --> <!-- 搜索框 -->
<view class="input-box"> <view class="input-box">
@ -58,8 +58,8 @@
<image class="mart30 width100" mode="widthFix" src="../../../static/img/headzq.png"></image> <image class="mart30 width100" mode="widthFix" src="../../../static/img/headzq.png"></image>
</view> </view>
<swiper class="orange-content" style="border: 2px solid #ff5836;" :display-multiple-items="productListleg"> <swiper class="orange-content" style="border: 2px solid #ff5836;" :display-multiple-items="productListleg">
<swiper-item class="swiper-hed" v-for="pro in productList" :key="product.id"> <swiper-item class="swiper-hed" v-for="pro in productList" :key="pro.id" @click="toGoods(pro.id)">
<view class="swiper-item" @tap="tapList" :data-id="pro.id"> <view class="swiper-item" :data-id="pro.id">
<image class="img" :src="imageUrl+pro.couponImg" mode="aspectFit"> <image class="img" :src="imageUrl+pro.couponImg" mode="aspectFit">
</image> </image>
<view class="fotct fcor333 font14 text1 mart10">{{pro.couponName}}</view> <view class="fotct fcor333 font14 text1 mart10">{{pro.couponName}}</view>
@ -74,8 +74,8 @@
</view> </view>
<!-- v-if="goldproductList&&goldproductList.length>0" --> <!-- v-if="goldproductList&&goldproductList.length>0" -->
<swiper class="orange-content" :display-multiple-items="goldproductListleg" next-margin="50rpx"> <swiper class="orange-content" :display-multiple-items="goldproductListleg" next-margin="50rpx">
<swiper-item class="swiper-hed" v-for="(item,index) in goldproductList" :key="index"> <swiper-item class="swiper-hed" v-for="(item,index) in goldproductList" :key="index" @click="toGoods(item.id)">
<view class="swiper-item" @tap="tapList" :data-id="item.id"> <view class="swiper-item" :data-id="item.id">
<image class="img" :src="imageUrl+item.couponImg" mode="aspectFit"></image> <image class="img" :src="imageUrl+item.couponImg" mode="aspectFit"></image>
<view class="fotct fcor333 font14 text1 mart10">{{item.couponName}}</view> <view class="fotct fcor333 font14 text1 mart10">{{item.couponName}}</view>
<view class="subject fotct mart5">{{ item.discountPrice}}</view> <view class="subject fotct mart5">{{ item.discountPrice}}</view>
@ -84,7 +84,7 @@
</swiper> </swiper>
<!-- 分期 --> <!-- 分期 -->
<view style="width: 90%;margin-left: 5%;"> <!-- <view style="width: 90%;margin-left: 5%;">
<image class="mart30 width100" mode="widthFix" src="../../../static/img/fqhed.png"></image> <image class="mart30 width100" mode="widthFix" src="../../../static/img/fqhed.png"></image>
</view> </view>
<swiper class="orange-content" :display-multiple-items="productListleg"> <swiper class="orange-content" :display-multiple-items="productListleg">
@ -97,13 +97,13 @@
</view> </view>
</swiper-item> </swiper-item>
</swiper> </swiper>
-->
<!-- 广告图 --> <!-- 广告图 -->
<!-- <view class="banner" @click="tao"> <!-- <view class="banner" @click="tao">
<image src="/static/img/banner.jpg"></image> <image src="/static/img/banner.jpg"></image>
</view> --> </view> -->
<!-- 商品列表 --> <!-- 商品列表 -->
<view class="goods-list"> <!-- <view class="goods-list">
<view :class="[cpStuats == 1?'active_tie':'title']" @click="eheckStu(1)"> <view :class="[cpStuats == 1?'active_tie':'title']" @click="eheckStu(1)">
猜你喜欢 猜你喜欢
</view> </view>
@ -130,7 +130,7 @@
</view> </view>
</view> </view>
</view> </view>
</view> </view> -->
<!-- <view class="goods-list"> <!-- <view class="goods-list">
<view class="title"> <view class="title">
@ -163,7 +163,7 @@
</view> </view>
</view> </view>
</view> --> </view> -->
<view class="height60"></view>
</view> </view>
</template> </template>
@ -212,23 +212,23 @@
categoryList: [{ categoryList: [{
id: 1, id: 1,
name: '团油', name: '团油',
img: '/static/img/wxpay.png', img: '/static/img/user/momey.png',
src: '/pages/goods/refuel/refuel' src: '/pages/goods/refuel/refuel'
}, },
{ {
id: 2, id: 2,
name: '电', name: '电影票',
img: '/static/img/wxpay.png' img: '/static/img/user/momey.png'
}, },
{ {
id: 3, id: 3,
name: '服饰', name: '肯德基',
img: '/static/img/wxpay.png' img: '/static/img/user/momey.png'
}, },
{ {
id: 4, id: 4,
name: '日用', name: '话费充值',
img: '/static/img/wxpay.png' img: '/static/img/user/momey.png'
} }
], ],
// //
@ -248,6 +248,11 @@
this.getH5AccessToken(arr2[1]); this.getH5AccessToken(arr2[1]);
} }
// #endif // #endif
if (app.globalData.cityName != '') {
this.city = app.globalData.cityName;
this.getCouponListArea();
this.getCouponListgold();
}
}, },
onLoad() { onLoad() {
// 1.wxcode // 1.wxcode
@ -317,6 +322,8 @@
success: function(res) { success: function(res) {
that.city = res.data.result.address_component.city.replace(/市/g, that.city = res.data.result.address_component.city.replace(/市/g,
''); '');
app.globalData.cityName = res.data.result.address_component.city
.replace(/市/g, '');
app.globalData.cityId = res.data.result.ad_info.adcode; app.globalData.cityId = res.data.result.ad_info.adcode;
// app.globalData.cityId = '500100'; // app.globalData.cityId = '500100';
that.getCouponListArea(); that.getCouponListArea();
@ -395,8 +402,8 @@
location: locationObj location: locationObj
}) })
.then(res => { .then(res => {
vm.city = res.result.address_component.city.replace(/市/g, vm.city = res.result.address_component.city.replace(/市/g, '');
''); app.globalData.cityName = res.result.address_component.city.replace(/市/g, '');
app.globalData.cityId = res.result.ad_info.adcode; app.globalData.cityId = res.result.ad_info.adcode;
vm.getCouponListArea(); vm.getCouponListArea();
vm.getCouponListgold(); vm.getCouponListgold();
@ -414,11 +421,17 @@
}) })
}, },
// //
goPostion(){ goPostion() {
uni.navigateTo({ uni.navigateTo({
url:'/pages/user/positioning/positioning' url: '/pages/user/positioning/positioning'
}) })
}, },
//
toGoods(e) {
uni.navigateTo({
url: '../../goods/goods?id='+e
});
},
// //
toScan() { toScan() {
uni.scanCode({ uni.scanCode({
@ -503,10 +516,17 @@
}, },
// //
toCategory(item) { toCategory(item) {
uni.navigateTo({ if(item.name == '团油'){
url: item.src uni.navigateTo({
}) url: item.src
})
}else{
uni.showToast({
title: '暂未开通',
icon: 'none',
duration: 2000
})
}
} }
} }
}; };
@ -591,9 +611,9 @@
.input-box { .input-box {
width: 100%; width: 100%;
height: 60upx; height: 70rpx;
background-color: #f5f5f5; background-color: #f5f5f5;
border-radius: 30upx; border-radius: 10rpx;
position: relative; position: relative;
display: flex; display: flex;
align-items: center; align-items: center;
@ -761,7 +781,7 @@
view { view {
height: 30upx; height: 30upx;
background-color: #f06c7a; background-color: #0083f5;
display: flex; display: flex;
justify-content: center; justify-content: center;
align-items: center; align-items: center;
@ -964,7 +984,7 @@
} }
.orange-content { .orange-content {
height: 160px; height: 170px;
width: 90%; width: 90%;
margin-left: 5%; margin-left: 5%;
border-radius: 0 0 10px 10px; border-radius: 0 0 10px 10px;
@ -1004,4 +1024,4 @@
color: #777; color: #777;
font-size: 28rpx; font-size: 28rpx;
} }
</style> </style>

@ -53,7 +53,7 @@
<view class="title">我的订单</view> <view class="title">我的订单</view>
<view class="list"> <view class="list">
<view class="box" v-for="(row,index) in orderList" :key="index" @tap="toOrderList(index)"> <view class="box" v-for="(row,index) in orderList" :key="index" @tap="toOrderList(index)">
<uni-badge style="width: 20px;position: absolute; left: 20%;" v-if="row.text == '待支付' && therrNum " <uni-badge style="width: 20px;position: absolute; left: 15%;" v-if="row.text == '待支付' && therrNum "
:text="therrNum" type="error" size="normal"></uni-badge> :text="therrNum" type="error" size="normal"></uni-badge>
<view class="img"> <view class="img">
<view class="icon" :class="row.icon"></view> <view class="icon" :class="row.icon"></view>
@ -149,15 +149,13 @@
{ {
text: '已完成', text: '已完成',
icon: "shouhuo" icon: "shouhuo"
}, },{
// { text: '已退款',
// text: '退', icon: "tuihuo"
// icon: "pingjia" },{
// },
{
text: '已取消', text: '已取消',
icon: "pingjia" icon: "pingjia"
}, }
], ],
// //
mytoolbarList: [{ mytoolbarList: [{
@ -196,12 +194,13 @@
url: '../../login/login?id=2', url: '../../login/login?id=2',
text: '我的推广', text: '我的推广',
img: '/static/img/user/renw.png' img: '/static/img/user/renw.png'
},
{
url: '/pages/user/Charge/Charge',
text: '充话费',
img: '/static/img/user/bank.png'
} }
// ,
// {
// url: '/pages/user/Charge/Charge',
// text: '',
// img: '/static/img/user/bank.png'
// }
] ]
} }
}, },
@ -371,7 +370,7 @@
height: 0; height: 0;
position: fixed; position: fixed;
z-index: 10; z-index: 10;
background-color: #f06c7a; background-color: #0083f5;
top: 0; top: 0;
/* #ifdef APP-PLUS */ /* #ifdef APP-PLUS */
height: var(--status-bar-height);// height: var(--status-bar-height);//
@ -389,7 +388,7 @@
position: fixed; position: fixed;
top: 0; top: 0;
z-index: 10; z-index: 10;
background-color: #f06c7a; background-color: #0083f5;
/* #ifdef APP-PLUS */ /* #ifdef APP-PLUS */
top: var(--status-bar-height); top: var(--status-bar-height);
/* #endif */ /* #endif */
@ -419,7 +418,7 @@
height: 0; height: 0;
position: fixed; position: fixed;
z-index: 10; z-index: 10;
background-color: #f06c7a; background-color: #0083f5;
top: 0; top: 0;
/* #ifdef APP-PLUS */ /* #ifdef APP-PLUS */
height: var(--status-bar-height); // height: var(--status-bar-height); //
@ -437,7 +436,7 @@
position: fixed; position: fixed;
top: 0; top: 0;
z-index: 10; z-index: 10;
background-color: #f06c7a; background-color: #0083f5;
/* #ifdef APP-PLUS */ /* #ifdef APP-PLUS */
top: var(--status-bar-height); top: var(--status-bar-height);
@ -461,7 +460,7 @@
} }
.place { .place {
background-color: #f06c7a; background-color: #0083f5;
padding-left: 20px; padding-left: 20px;
padding-right: 20px; padding-right: 20px;
text-align: right; text-align: right;
@ -486,7 +485,7 @@
display: flex; display: flex;
align-items: center; align-items: center;
// position: relative; // position: relative;
background-color: #f06c7a; background-color: #0083f5;
padding-bottom: 40rpx; padding-bottom: 40rpx;
.left { .left {
@ -728,4 +727,4 @@
} }
} }
} }
</style> </style>

@ -125,9 +125,9 @@
box-shadow: 0upx 5upx 20upx rgba(0,0,0,0.05); box-shadow: 0upx 5upx 20upx rgba(0,0,0,0.05);
font-size: 36upx; font-size: 36upx;
background-color: #f1f1f1; background-color: #f1f1f1;
color: #f06c7a; color: #0083f5;
&.on{ &.on{
background-color: #f06c7a; background-color: #0083f5;
color: #ffffff; color: #ffffff;
} }
} }
@ -161,7 +161,7 @@
margin: 0 20upx; margin: 0 20upx;
height: 60upx; height: 60upx;
font-size: 30upx; font-size: 30upx;
color: #f06c7a; color: #0083f5;
justify-content: flex-end; justify-content: flex-end;
align-items: center; align-items: center;
} }
@ -214,7 +214,7 @@
justify-content: center; justify-content: center;
align-items: center; align-items: center;
color: #fff; color: #fff;
background-color: #f06c7a; background-color: #0083f5;
box-shadow: 0upx 5upx 10upx rgba(0,0,0,0.2); box-shadow: 0upx 5upx 10upx rgba(0,0,0,0.2);
} }
.tis{ .tis{

@ -1,239 +1,239 @@
<template> <template>
<view> <view>
<view class="content"> <view class="content">
<view class="list"> <view class="list">
<view class="row" v-for="(row,index) in addressList" :key="index" @tap="select(row)"> <view class="row" v-for="(row,index) in addressList" :key="index" @tap="select(row)">
<view class="left"> <view class="left">
<view class="head"> <view class="head">
{{row.head}} {{row.head}}
</view> </view>
</view> </view>
<view class="center"> <view class="center">
<view class="name-tel"> <view class="name-tel">
<view class="name">{{row.name}}</view> <view class="name">{{row.name}}</view>
<view class="tel">{{row.tel}}</view> <view class="tel">{{row.tel}}</view>
<view class="default" v-if="row.isDefault"> <view class="default" v-if="row.isDefault">
默认 默认
</view> </view>
</view> </view>
<view class="address"> <view class="address">
{{row.address.region.label}} {{row.address.detailed}} {{row.address.region.label}} {{row.address.detailed}}
</view> </view>
</view> </view>
<view class="right"> <view class="right">
<view class="icon bianji" @tap.stop="edit(row)"> <view class="icon bianji" @tap.stop="edit(row)">
</view> </view>
</view> </view>
</view> </view>
</view> </view>
</view> </view>
<view class="add"> <view class="add">
<view class="btn" @tap="add"> <view class="btn" @tap="add">
<view class="icon tianjia"></view>新增地址 <view class="icon tianjia"></view>新增地址
</view> </view>
</view> </view>
</view> </view>
</template> </template>
<script> <script>
export default { export default {
data() { data() {
return { return {
isSelect:false, isSelect:false,
addressList:[ addressList:[
{id:1,name:"大黑哥",head:"大",tel:"18816881688",address:{region:{"label":"广东省-深圳市-福田区","value":[18,2,1],"cityCode":"440304"},detailed:'深南大道1111号无名摩登大厦6楼A2'},isDefault:true}, {id:1,name:"大黑哥",head:"大",tel:"18816881688",address:{region:{"label":"广东省-深圳市-福田区","value":[18,2,1],"cityCode":"440304"},detailed:'深南大道1111号无名摩登大厦6楼A2'},isDefault:true},
{id:2,name:"大黑哥",head:"大",tel:"15812341234",address:{region:{"label":"广东省-深圳市-福田区","value":[18,2,1],"cityCode":"440304"},detailed:'深北小道2222号有名公寓502'},isDefault:false}, {id:2,name:"大黑哥",head:"大",tel:"15812341234",address:{region:{"label":"广东省-深圳市-福田区","value":[18,2,1],"cityCode":"440304"},detailed:'深北小道2222号有名公寓502'},isDefault:false},
{id:3,name:"老大哥",head:"老",tel:"18155467897",address:{region:{"label":"广东省-深圳市-福田区","value":[18,2,1],"cityCode":"440304"},detailed:'深南大道1111号无名摩登大厦6楼A2'},isDefault:false}, {id:3,name:"老大哥",head:"老",tel:"18155467897",address:{region:{"label":"广东省-深圳市-福田区","value":[18,2,1],"cityCode":"440304"},detailed:'深南大道1111号无名摩登大厦6楼A2'},isDefault:false},
{id:4,name:"王小妹",head:"王",tel:"13425654895",address:{region:{"label":"广东省-深圳市-福田区","value":[18,2,1],"cityCode":"440304"},detailed:'深南大道1111号无名摩登大厦6楼A2'},isDefault:false}, {id:4,name:"王小妹",head:"王",tel:"13425654895",address:{region:{"label":"广东省-深圳市-福田区","value":[18,2,1],"cityCode":"440304"},detailed:'深南大道1111号无名摩登大厦6楼A2'},isDefault:false},
] ]
}; };
}, },
onShow() { onShow() {
uni.getStorage({ uni.getStorage({
key:'delAddress', key:'delAddress',
success: (e) => { success: (e) => {
let len = this.addressList.length; let len = this.addressList.length;
if(e.data.hasOwnProperty('id')){ if(e.data.hasOwnProperty('id')){
for(let i=0;i<len;i++){ for(let i=0;i<len;i++){
if(this.addressList[i].id==e.data.id){ if(this.addressList[i].id==e.data.id){
this.addressList.splice(i,1); this.addressList.splice(i,1);
break; break;
} }
} }
} }
uni.removeStorage({ uni.removeStorage({
key:'delAddress' key:'delAddress'
}) })
} }
}) })
uni.getStorage({ uni.getStorage({
key:'saveAddress', key:'saveAddress',
success: (e) => { success: (e) => {
let len = this.addressList.length; let len = this.addressList.length;
if(e.data.hasOwnProperty('id')){ if(e.data.hasOwnProperty('id')){
for(let i=0;i<len;i++){ for(let i=0;i<len;i++){
if(this.addressList[i].id==e.data.id){ if(this.addressList[i].id==e.data.id){
this.addressList.splice(i,1,e.data); this.addressList.splice(i,1,e.data);
break; break;
} }
} }
}else{ }else{
let lastid = this.addressList[len-1]; let lastid = this.addressList[len-1];
lastid++; lastid++;
e.data.id = lastid; e.data.id = lastid;
this.addressList.push(e.data); this.addressList.push(e.data);
} }
uni.removeStorage({ uni.removeStorage({
key:'saveAddress' key:'saveAddress'
}) })
} }
}) })
}, },
onLoad(e) { onLoad(e) {
if(e.type=='select'){ if(e.type=='select'){
this.isSelect = true; this.isSelect = true;
} }
}, },
methods:{ methods:{
edit(row){ edit(row){
uni.setStorage({ uni.setStorage({
key:'address', key:'address',
data:row, data:row,
success() { success() {
uni.navigateTo({ uni.navigateTo({
url:"edit/edit?type=edit" url:"edit/edit?type=edit"
}) })
} }
}); });
}, },
add(){ add(){
uni.navigateTo({ uni.navigateTo({
url:"edit/edit?type=add" url:"edit/edit?type=add"
}) })
}, },
select(row){ select(row){
//() //()
if(!this.isSelect){ if(!this.isSelect){
return ; return ;
} }
uni.setStorage({ uni.setStorage({
key:'selectAddress', key:'selectAddress',
data:row, data:row,
success() { success() {
uni.navigateBack(); uni.navigateBack();
} }
}) })
} }
} }
} }
</script> </script>
<style lang="scss"> <style lang="scss">
view{ view{
display: flex; display: flex;
} }
.icon { .icon {
// &.bianji { // &.bianji {
// &:before{content:"\e61b";} // &:before{content:"\e61b";}
// } // }
// &.tianjia { // &.tianjia {
// &:before{content:"\e81a";} // &:before{content:"\e81a";}
// } // }
} }
.add{ .add{
position: fixed; position: fixed;
bottom: 0; bottom: 0;
width: 100%; width: 100%;
height: 120upx; height: 120upx;
justify-content: center; justify-content: center;
align-items: center; align-items: center;
.btn{ .btn{
box-shadow: 0upx 5upx 10upx rgba(0,0,0,0.4); box-shadow: 0upx 5upx 10upx rgba(0,0,0,0.4);
width: 70%; width: 70%;
height: 80upx; height: 80upx;
border-radius: 80upx; border-radius: 80upx;
background-color: #f06c7a; background-color: #0083f5;
color: #fff; color: #fff;
justify-content: center; justify-content: center;
align-items: center; align-items: center;
.icon{ .icon{
height: 80upx; height: 80upx;
color: #fff; color: #fff;
font-size: 30upx; font-size: 30upx;
justify-content: center; justify-content: center;
align-items: center; align-items: center;
} }
font-size: 30upx; font-size: 30upx;
} }
} }
.list{ .list{
flex-wrap: wrap; flex-wrap: wrap;
.row{ .row{
width: 96%; width: 96%;
padding: 20upx 2%; padding: 20upx 2%;
.left{ .left{
width: 90upx; width: 90upx;
flex-shrink: 0; flex-shrink: 0;
align-items: center; align-items: center;
.head{ .head{
width: 70upx; width: 70upx;
height: 70upx; height: 70upx;
background:linear-gradient(to right,#ccc,#aaa); background:linear-gradient(to right,#ccc,#aaa);
color: #fff; color: #fff;
justify-content: center; justify-content: center;
align-items: center; align-items: center;
border-radius: 60upx; border-radius: 60upx;
font-size: 35upx; font-size: 35upx;
} }
} }
.center{ .center{
width: 100%; width: 100%;
flex-wrap: wrap; flex-wrap: wrap;
.name-tel{ .name-tel{
width: 100%; width: 100%;
align-items: baseline; align-items: baseline;
.name{ .name{
font-size: 34upx; font-size: 34upx;
} }
.tel{ .tel{
margin-left: 30upx; margin-left: 30upx;
font-size: 24upx; font-size: 24upx;
color: #777; color: #777;
} }
.default{ .default{
font-size: 22upx; font-size: 22upx;
background-color: #f06c7a; background-color: #0083f5;
color: #fff; color: #fff;
padding: 0 18upx; padding: 0 18upx;
border-radius: 24upx; border-radius: 24upx;
margin-left: 20upx; margin-left: 20upx;
} }
} }
.address{ .address{
width: 100%; width: 100%;
font-size: 24upx; font-size: 24upx;
align-items: baseline; align-items: baseline;
color: #777; color: #777;
} }
} }
.right{ .right{
flex-shrink: 0; flex-shrink: 0;
align-items: center; align-items: center;
margin-left: 20upx; margin-left: 20upx;
.icon{ .icon{
justify-content: center; justify-content: center;
align-items: center; align-items: center;
width: 80upx; width: 80upx;
height: 60upx; height: 60upx;
border-left: solid 1upx #aaa; border-left: solid 1upx #aaa;
font-size: 40upx; font-size: 40upx;
color: #777; color: #777;
} }
} }
} }
} }
</style> </style>

@ -1,261 +1,261 @@
<template> <template>
<view> <view>
<view class="content"> <view class="content">
<view class="row"> <view class="row">
<view class="nominal"> <view class="nominal">
收件人 收件人
</view> </view>
<view class="input"> <view class="input">
<input placeholder="请输入收件人姓名" type="text" v-model="name" /> <input placeholder="请输入收件人姓名" type="text" v-model="name" />
</view> </view>
</view> </view>
<view class="row"> <view class="row">
<view class="nominal"> <view class="nominal">
电话号码 电话号码
</view> </view>
<view class="input"> <view class="input">
<input placeholder="请输入收件人电话号码" type="text" v-model="tel" /> <input placeholder="请输入收件人电话号码" type="text" v-model="tel" />
</view> </view>
</view> </view>
<view class="row"> <view class="row">
<view class="nominal"> <view class="nominal">
所在地区 所在地区
</view> </view>
<view class="input" @tap="chooseCity"> <view class="input" @tap="chooseCity">
{{region.label}} {{region.label}}
</view> </view>
</view> </view>
<view class="row"> <view class="row">
<view class="nominal"> <view class="nominal">
详细地址 详细地址
</view> </view>
<view class="input"> <view class="input">
<textarea v-model="detailed" auto-height="true" placeholder="输入详细地址"></textarea> <textarea v-model="detailed" auto-height="true" placeholder="输入详细地址"></textarea>
</view> </view>
</view> </view>
<view class="row"> <view class="row">
<view class="nominal"> <view class="nominal">
设置默认地址 设置默认地址
</view> </view>
<view class="input switch"> <view class="input switch">
<switch color="#f06c7a" :checked="isDefault" @change=isDefaultChange /> <switch color="#0083f5" :checked="isDefault" @change=isDefaultChange />
</view> </view>
</view> </view>
<view class="row" v-if="editType=='edit'" @tap="del"> <view class="row" v-if="editType=='edit'" @tap="del">
<view class="del"> <view class="del">
删除收货地址 删除收货地址
</view> </view>
</view> </view>
</view>
<view class="save" @tap="save">
<view class="btn">
保存地址
</view>
</view> </view>
<view class="save" @tap="save">
<view class="btn">
保存地址
</view>
</view>
<mpvue-city-picker :themeColor="themeColor" ref="mpvueCityPicker" :pickerValueDefault="cityPickerValue" @onCancel="onCancel" @onConfirm="onConfirm"></mpvue-city-picker> <mpvue-city-picker :themeColor="themeColor" ref="mpvueCityPicker" :pickerValueDefault="cityPickerValue" @onCancel="onCancel" @onConfirm="onConfirm"></mpvue-city-picker>
</view> </view>
</template> </template>
<script> <script>
import mpvueCityPicker from '@/components/mpvue-citypicker/mpvueCityPicker.vue' import mpvueCityPicker from '@/components/mpvue-citypicker/mpvueCityPicker.vue'
export default { export default {
components: { components: {
mpvueCityPicker mpvueCityPicker
}, },
data() { data() {
return { return {
editType:'edit', editType:'edit',
id:'', id:'',
name:'', name:'',
tel:'', tel:'',
detailed:'', detailed:'',
isDefault:false, isDefault:false,
cityPickerValue: [0, 0, 1], cityPickerValue: [0, 0, 1],
themeColor: '#007AFF', themeColor: '#007AFF',
region:{label:"请点击选择地址",value:[],cityCode:""} region:{label:"请点击选择地址",value:[],cityCode:""}
}; };
}, },
methods: { methods: {
onCancel(e) { onCancel(e) {
console.log(e) console.log(e)
}, },
chooseCity() { chooseCity() {
this.$refs.mpvueCityPicker.show() this.$refs.mpvueCityPicker.show()
}, },
onConfirm(e) { onConfirm(e) {
this.region = e; this.region = e;
this.cityPickerValue = e.value; this.cityPickerValue = e.value;
}, },
isDefaultChange(e){ isDefaultChange(e){
this.isDefault = e.detail.value; this.isDefault = e.detail.value;
}, },
del(){ del(){
uni.showModal({ uni.showModal({
title: '删除提示', title: '删除提示',
content: '你将删除这个收货地址', content: '你将删除这个收货地址',
success: (res)=>{ success: (res)=>{
if (res.confirm) { if (res.confirm) {
uni.setStorage({ uni.setStorage({
key:'delAddress', key:'delAddress',
data:{id:this.id}, data:{id:this.id},
success() { success() {
uni.navigateBack(); uni.navigateBack();
} }
}) })
} else if (res.cancel) { } else if (res.cancel) {
console.log('用户点击取消'); console.log('用户点击取消');
} }
} }
}); });
}, },
save(){ save(){
let data={"name":this.name,"head":this.name.substr(0,1),"tel":this.tel,"address":{"region":this.region,"detailed":this.detailed},"isDefault":this.isDefault} let data={"name":this.name,"head":this.name.substr(0,1),"tel":this.tel,"address":{"region":this.region,"detailed":this.detailed},"isDefault":this.isDefault}
if(this.editType=='edit'){ if(this.editType=='edit'){
data.id = this.id data.id = this.id
} }
if(!data.name){ if(!data.name){
uni.showToast({title:'请输入收件人姓名',icon:'none'}); uni.showToast({title:'请输入收件人姓名',icon:'none'});
return ; return ;
} }
if(!data.tel){ if(!data.tel){
uni.showToast({title:'请输入收件人电话号码',icon:'none'}); uni.showToast({title:'请输入收件人电话号码',icon:'none'});
return ; return ;
} }
if(!data.address.detailed){ if(!data.address.detailed){
uni.showToast({title:'请输入收件人详细地址',icon:'none'}); uni.showToast({title:'请输入收件人详细地址',icon:'none'});
return ; return ;
} }
if(data.address.region.value.length==0){ if(data.address.region.value.length==0){
uni.showToast({title:'请选择收件地址',icon:'none'}); uni.showToast({title:'请选择收件地址',icon:'none'});
return ; return ;
} }
uni.showLoading({ uni.showLoading({
title:'正在提交' title:'正在提交'
}) })
//ajax, //ajax,
setTimeout(()=>{ setTimeout(()=>{
uni.setStorage({ uni.setStorage({
key:'saveAddress', key:'saveAddress',
data:data, data:data,
success() { success() {
uni.hideLoading(); uni.hideLoading();
uni.navigateBack(); uni.navigateBack();
} }
}) })
},300) },300)
} }
}, },
onLoad(e) { onLoad(e) {
// //
this.editType = e.type; this.editType = e.type;
if(e.type=='edit'){ if(e.type=='edit'){
uni.getStorage({ uni.getStorage({
key:'address', key:'address',
success: (e) => { success: (e) => {
this.id = e.data.id; this.id = e.data.id;
this.name = e.data.name; this.name = e.data.name;
this.tel = e.data.tel; this.tel = e.data.tel;
this.detailed = e.data.address.detailed; this.detailed = e.data.address.detailed;
this.isDefault = e.data.isDefault; this.isDefault = e.data.isDefault;
this.cityPickerValue = e.data.address.region.value; this.cityPickerValue = e.data.address.region.value;
this.region = e.data.address.region; this.region = e.data.address.region;
} }
}) })
} }
}, },
onBackPress() { onBackPress() {
if (this.$refs.mpvueCityPicker.showPicker) { if (this.$refs.mpvueCityPicker.showPicker) {
this.$refs.mpvueCityPicker.pickerCancel(); this.$refs.mpvueCityPicker.pickerCancel();
return true; return true;
} }
}, },
onUnload() { onUnload() {
if (this.$refs.mpvueCityPicker.showPicker) { if (this.$refs.mpvueCityPicker.showPicker) {
this.$refs.mpvueCityPicker.pickerCancel() this.$refs.mpvueCityPicker.pickerCancel()
} }
} }
}; };
</script> </script>
<style lang="scss"> <style lang="scss">
.save{ .save{
view{ view{
display: flex; display: flex;
} }
position: fixed; position: fixed;
bottom: 0; bottom: 0;
width: 100%; width: 100%;
height: 120upx; height: 120upx;
display: flex; display: flex;
justify-content: center; justify-content: center;
align-items: center; align-items: center;
.btn{ .btn{
box-shadow: 0upx 5upx 10upx rgba(0,0,0,0.4); box-shadow: 0upx 5upx 10upx rgba(0,0,0,0.4);
width: 70%; width: 70%;
height: 80upx; height: 80upx;
border-radius: 80upx; border-radius: 80upx;
background-color: #f06c7a; background-color: #0083f5;
color: #fff; color: #fff;
justify-content: center; justify-content: center;
align-items: center; align-items: center;
.icon{ .icon{
height: 80upx; height: 80upx;
color: #fff; color: #fff;
font-size: 30upx; font-size: 30upx;
justify-content: center; justify-content: center;
align-items: center; align-items: center;
} }
font-size: 30upx; font-size: 30upx;
} }
} }
.content{ .content{
display: flex; display: flex;
flex-wrap: wrap; flex-wrap: wrap;
view{ view{
display: flex; display: flex;
} }
.row{ .row{
width: 94%; width: 94%;
margin: 0 3%; margin: 0 3%;
border-top: solid 1upx #eee; border-top: solid 1upx #eee;
.nominal{ .nominal{
width: 30%; width: 30%;
height: 120upx; height: 120upx;
font-weight: 200; font-weight: 200;
font-size: 30upx; font-size: 30upx;
align-items: center; align-items: center;
} }
.input{ .input{
width: 70%; width: 70%;
padding: 20upx 0; padding: 20upx 0;
align-items: center; align-items: center;
font-size: 30upx; font-size: 30upx;
&.switch{ &.switch{
justify-content: flex-end; justify-content: flex-end;
} }
.textarea{ .textarea{
margin: 20upx 0; margin: 20upx 0;
min-height: 120upx; min-height: 120upx;
} }
} }
.del{ .del{
width: 100%; width: 100%;
height: 100upx; height: 100upx;
justify-content: center; justify-content: center;
align-items: center; align-items: center;
font-size: 36upx; font-size: 36upx;
color: #f06c7a; color: #0083f5;
background-color: rgba(255,0,0,0.05); background-color: rgba(255,0,0,0.05);
border-bottom: solid 1upx #eee; border-bottom: solid 1upx #eee;
} }
} }
} }
</style> </style>

@ -43,10 +43,10 @@
let datas = { let datas = {
"code": res.result "code": res.result
} }
useCouponCode(datas).then(res => { useCouponCode(datas).then(res => {
if (res.return_code == '000000') { if (res.return_code == '000000') {
uni.showToast({ uni.showToast({
title: res.return_data, title: res.return_data,
duration: 2000 duration: 2000
}) })
} else { } else {
@ -90,11 +90,11 @@
align-items: center; align-items: center;
&.on { &.on {
color: #f06c7a; color: #0083f5;
border-bottom: solid 4upx #f06c7a; border-bottom: solid 4upx #0083f5;
} }
} }
} }
} }
</style> </style>

@ -350,12 +350,12 @@
} }
.on { .on {
color: #f06c7a; color: #0083f5;
} }
.border { .border {
height: 4upx; height: 4upx;
background-color: #f06c7a; background-color: #0083f5;
transition: all .3s ease-out; transition: all .3s ease-out;
&.invalid { &.invalid {
@ -620,4 +620,4 @@
* */ * */
} }
} }
</style> </style>

@ -44,7 +44,7 @@
支付宝支付 支付宝支付
</view> </view>
<view class="right"> <view class="right">
<radio :checked="paytype=='alipay'" color="#f06c7a" /> <radio :checked="paytype=='alipay'" color="#0083f5" />
</view> </view>
</view> --> </view> -->
<view class="row" @tap="paytype='wxpay'"> <view class="row" @tap="paytype='wxpay'">
@ -55,7 +55,7 @@
微信支付 微信支付
</view> </view>
<view class="right"> <view class="right">
<radio :checked="paytype=='wxpay'" color="#f06c7a" /> <radio :checked="paytype=='wxpay'" color="#0083f5" />
</view> </view>
</view> </view>
</view> </view>
@ -285,7 +285,7 @@
color: 333; color: 333;
&.on { &.on {
background-color: #f06c7a; background-color: #0083f5;
color: #fff; color: #fff;
} }
} }
@ -313,7 +313,7 @@
margin: 0 20upx; margin: 0 20upx;
height: 60upx; height: 60upx;
font-size: 30upx; font-size: 30upx;
color: #f06c7a; color: #0083f5;
justify-content: flex-end; justify-content: flex-end;
align-items: center; align-items: center;
} }
@ -374,7 +374,7 @@
justify-content: center; justify-content: center;
align-items: center; align-items: center;
color: #fff; color: #fff;
background-color: #f06c7a; background-color: #0083f5;
box-shadow: 0upx 5upx 10upx rgba(0, 0, 0, 0.2); box-shadow: 0upx 5upx 10upx rgba(0, 0, 0, 0.2);
} }
@ -392,4 +392,4 @@
} }
} }
} }
</style> </style>

@ -228,11 +228,11 @@
color: #999; color: #999;
} }
.on{ .on{
color: #f06c7a; color: #0083f5;
} }
.border{ .border{
height: 4upx; height: 4upx;
background-color: #f06c7a; background-color: #0083f5;
transition: all .3s ease-out; transition: all .3s ease-out;
&.shop{ &.shop{
transform: translate3d(100%,0,0); transform: translate3d(100%,0,0);
@ -383,7 +383,7 @@
} }
.price{ .price{
font-size: 30upx; font-size: 30upx;
color: #f06c7a; color: #0083f5;
} }
} }
} }
@ -393,4 +393,4 @@
} }
} }
</style> </style>

@ -167,8 +167,8 @@
align-items: center; align-items: center;
&.on { &.on {
color: #f06c7a; color: #0083f5;
border-bottom: solid 4upx #f06c7a; border-bottom: solid 4upx #0083f5;
} }
} }
} }
@ -225,4 +225,4 @@
} }
} }
} }
</style> </style>

@ -160,7 +160,7 @@
width: 15px; width: 15px;
height: 2px; height: 2px;
margin-top: 8px; margin-top: 8px;
background-color: #f06c7a; background-color: #0083f5;
transform: rotate(100deg); transform: rotate(100deg);
} }
@ -173,7 +173,7 @@
width: 10px; width: 10px;
margin-top: 8px; margin-top: 8px;
height: 2px; height: 2px;
background-color: #f06c7a; background-color: #0083f5;
transform: rotate(100deg); transform: rotate(100deg);
} }

@ -1,19 +1,19 @@
<template> <template>
<view> <view>
<view class="block"> <view class="block">
</view> </view>
<!-- <view class="QR"> <!-- <view class="QR">
<image src="../../../static/img/qr.png"></image> <image src="../../../static/img/qr.png"></image>
</view> --> </view> -->
<view class="title"> <view class="title">
扫描二维码加我好友 扫描二维码加我好友
</view> </view>
<view class="btn" v-show="showBtn" @tap="printscreen"> <view class="btn" v-show="showBtn" @tap="printscreen">
{{tis}} {{tis}}
</view> </view>
<!-- <view class="logo"> <!-- <view class="logo">
<image mode="widthFix" src="../../../static/img/qrlogo.png"></image> <image mode="widthFix" src="../../../static/img/qrlogo.png"></image>
</view> --> </view> -->
</view> </view>
</template> </template>
@ -21,110 +21,110 @@
<script> <script>
export default { export default {
data() { data() {
return { return {
tis:"保存到相册", tis:"保存到相册",
showBtn:false showBtn:false
}; };
}, },
onLoad() { onLoad() {
// #ifdef APP-PLUS // #ifdef APP-PLUS
this.showBtn = true; this.showBtn = true;
// #endif // #endif
}, },
methods:{ methods:{
// webviewBitmap // webviewBitmap
printscreen(){ printscreen(){
this.tis = "正在保存" this.tis = "正在保存"
let ws=this.$mp.page.$getAppWebview(); let ws=this.$mp.page.$getAppWebview();
let bitmap = new plus.nativeObj.Bitmap(); let bitmap = new plus.nativeObj.Bitmap();
this.showBtn = false; this.showBtn = false;
this.$nextTick(function(){ this.$nextTick(function(){
setTimeout(()=>{ setTimeout(()=>{
ws.draw(bitmap,(e)=>{ ws.draw(bitmap,(e)=>{
this.showBtn = true; this.showBtn = true;
console.log('bitmap绘制图片成功'); console.log('bitmap绘制图片成功');
console.log("e: " + JSON.stringify(e)); console.log("e: " + JSON.stringify(e));
bitmap.save("_doc/Qr.jpg", { bitmap.save("_doc/Qr.jpg", {
overwrite: true, overwrite: true,
quality: 100 quality: 100
}, (i)=>{ }, (i)=>{
plus.gallery.save(i.target,(e)=>{ plus.gallery.save(i.target,(e)=>{
uni.showToast({ uni.showToast({
title:'保存成功' title:'保存成功'
}) })
this.tis = "保存到相册" this.tis = "保存到相册"
bitmap.clear(); // bitmap.clear(); //
},(e)=>{ },(e)=>{
bitmap.clear(); // bitmap.clear(); //
}); });
},(e)=>{ },(e)=>{
console.log('保存图片失败:' + JSON.stringify(e)); console.log('保存图片失败:' + JSON.stringify(e));
}); });
},(e)=>{ },(e)=>{
console.log('bitmap绘制图片失败:'+JSON.stringify(e)); console.log('bitmap绘制图片失败:'+JSON.stringify(e));
}); });
},200) },200)
}) })
} }
} }
} }
</script> </script>
<style lang="scss"> <style lang="scss">
page{ page{
background-color: #f06c7a; background-color: #0083f5;
} }
.block{ .block{
width: 100%; width: 100%;
height: 30vh; height: 30vh;
background-color: #fff; background-color: #fff;
display: flex; display: flex;
justify-content: center; justify-content: center;
} }
.QR{ .QR{
width: 60vw; width: 60vw;
height: 60vw; height: 60vw;
margin: -40vw auto 0 auto; margin: -40vw auto 0 auto;
background-color: #fff; background-color: #fff;
display: flex; display: flex;
justify-content: center; justify-content: center;
align-items: center; align-items: center;
image{ image{
width: 50vw; width: 50vw;
height: 50vw; height: 50vw;
} }
} }
.title{ .title{
width: 100%; width: 100%;
margin-top: 50upx; margin-top: 50upx;
display: flex; display: flex;
justify-content: center; justify-content: center;
font-size: 36upx; font-size: 36upx;
color: #fff; color: #fff;
} }
.btn{ .btn{
width: 50%; width: 50%;
height: 80upx; height: 80upx;
border-radius: 80upx; border-radius: 80upx;
display: flex; display: flex;
justify-content: center; justify-content: center;
align-items: center; align-items: center;
padding: 0 20upx; padding: 0 20upx;
margin: 0 auto; margin: 0 auto;
margin-top: 50upx; margin-top: 50upx;
background-color: rgba(255,255,255,.8); background-color: rgba(255,255,255,.8);
} }
.logo{ .logo{
width: 100%; width: 100%;
display: flex; display: flex;
justify-content: center; justify-content: center;
position: absolute; position: absolute;
bottom: 25upx; bottom: 25upx;
image{ image{
width: 39.6%; width: 39.6%;
} }
} }
</style> </style>

@ -5,6 +5,8 @@
<view class="width100 font18 fcorfff fotct height40 backcorf06" v-if="recinfo.orderStatus == 3">已完成</view> <view class="width100 font18 fcorfff fotct height40 backcorf06" v-if="recinfo.orderStatus == 3">已完成</view>
<view class="width100 font18 fcorfff fotct height40 backcorf06" v-if="recinfo.orderStatus == 4">已退款</view> <view class="width100 font18 fcorfff fotct height40 backcorf06" v-if="recinfo.orderStatus == 4">已退款</view>
<view class="width100 font18 fcorfff fotct height40 backcorf06" v-if="recinfo.orderStatus == 5">已取消</view> <view class="width100 font18 fcorfff fotct height40 backcorf06" v-if="recinfo.orderStatus == 5">已取消</view>
<view class="width100 font18 fcorfff fotct height40 backcorf06" v-if="recinfo.orderStatus == 6">退款中</view>
<view class="width100 font18 fcorfff fotct height40 backcorf06" v-if="recinfo.orderStatus == 7">退款失败</view>
<!-- 购买商品列表 --> <!-- 购买商品列表 -->
<view class="buy-list" v-for="rec in recinfo.highChildOrderList" :key="rec.id" <view class="buy-list" v-for="rec in recinfo.highChildOrderList" :key="rec.id"
@click="toGoods(rec.goodsId,rec.goodsType)"> @click="toGoods(rec.goodsId,rec.goodsType)">
@ -12,7 +14,7 @@
<view class="row"> <view class="row">
<view class="goods-info"> <view class="goods-info">
<view class="img"> <view class="img">
<image :src="imageUrl+rec.goodsImg" v-if="rec.goodsType != 2 "></image> <image :src="imageUrl+rec.goodsImg" v-if="rec.goodsType == 1 "></image>
<image :src="rec.goodsImg" v-else></image> <image :src="rec.goodsImg" v-else></image>
</view> </view>
<view class="info"> <view class="info">
@ -41,6 +43,14 @@
{{recinfo.orderNo}} {{recinfo.orderNo}}
</view> </view>
</view> </view>
<view class="row" v-if="recinfo.highChildOrderList[0].gasOrderNo !=null">
<view class="left">
加油单号 :
</view>
<view class="right">
{{recinfo.highChildOrderList[0].gasOrderNo}}
</view>
</view>
<view class="row" v-if="recinfo.paySerialNo"> <view class="row" v-if="recinfo.paySerialNo">
<view class="left"> <view class="left">
支付流水号 : 支付流水号 :
@ -106,7 +116,7 @@
</view> </view>
<view class="row" v-if="recinfo.deductionPrice"> <view class="row" v-if="recinfo.deductionPrice">
<view class="left"> <view class="left">
优惠券抵扣 : 优惠金额 :
</view> </view>
<view class="right" v-if="recinfo.payType != 3"> <view class="right" v-if="recinfo.payType != 3">
{{recinfo.deductionPrice}} {{recinfo.deductionPrice}}
@ -141,6 +151,14 @@
{{recinfo.cancelTime | formatDate('-')}} {{recinfo.cancelTime | formatDate('-')}}
</view> </view>
</view> </view>
<view class="row" v-if="recinfo.refusalRefundContent != null">
<view class="left">
退款失败原因 :
</view>
<view class="right">
{{recinfo.refusalRefundContent}}
</view>
</view>
<view class="row" v-if="recinfo.finishTime"> <view class="row" v-if="recinfo.finishTime">
<view class="left"> <view class="left">
完成时间 : 完成时间 :
@ -527,7 +545,7 @@
height: 40upx; height: 40upx;
.price { .price {
color: #f06c7a; color: #0083f5;
} }
.number { .number {
@ -612,7 +630,7 @@
height: 60upx; height: 60upx;
width: 20%; width: 20%;
margin-left: 10px; margin-left: 10px;
background-color: #f06c7a; background-color: #0083f5;
color: #fff; color: #fff;
display: flex; display: flex;
justify-content: center; justify-content: center;
@ -642,8 +660,8 @@
.content { .content {
font-size: 26upx; font-size: 26upx;
color: #f06c7a; color: #0083f5;
} }
} }
} }
</style> </style>

File diff suppressed because one or more lines are too long

@ -1,44 +1,60 @@
<template> <template>
<view> <view>
<view class="width100 backcorfff"> <view class="width100 backcorfff">
<uSearchBar @confirm="search" @input="input"></uSearchBar> <!-- <uSearchBar @confirm="search" @input="input"></uSearchBar>
<view class="line1 mart10"></view> <view class="line1 mart10"></view> -->
<view class="width90 mart20 font15 fcor333">当前定位</view> <view class="width90 mart20 font15 fcor333">当前定位</view>
<view class="posacname actives width90 mart20">南充</view> <view class="posacname actives width90 mart20">{{posName}}</view>
<view class="width90 mart20 font14 fcor333">其他地区</view> <view class="width90 mart20 font14 fcor333">其他地区</view>
<view class="posacname mart20 flleft font14" :class="{'actives':posId===item.name}" v-for="(item,index) in posList" @click="change(item)"> <view class="posacname mart20 flleft font14" :class="{'actives':posId===item.regionId}"
{{item.name}}</view> v-for="(item,index) in posList" @click="change(item)">
{{item.regionName}}
</view>
</view> </view>
</view> </view>
</template> </template>
<script> <script>
import uSearchBar from '../../../components/uni-search-bar/components/uni-search-bar/uni-search-bar.vue'; import uSearchBar from '../../../components/uni-search-bar/components/uni-search-bar/uni-search-bar.vue';
import {
getDredgeProvince
} from '../../../Utils/Api.js';
let app = getApp();
export default { export default {
components: { components: {
uSearchBar uSearchBar
}, },
data() { data() {
return { return {
posList: [{ posList: [],
name: '南充' posId: '',
}, posName: ''
{
name: '高坪'
},
{
name: '嘉陵'
},
{
name: '南部'
}
],
posId: ''
} }
}, },
onLoad() {
this.getDredgeProvince();
this.posName = app.globalData.cityName;
},
methods: { methods: {
getDredgeProvince() {
uni.showLoading({
title: '加载中'
})
getDredgeProvince().then(res => {
uni.hideLoading()
if (res.return_code == '000000') {
this.posList = res.return_data;
}
});
},
change(item) { change(item) {
this.posId = item.name; this.posId = item.regionId;
this.posName = item.regionName;
app.globalData.cityId = item.regionId;
app.globalData.cityName = item.regionName.replace(/市/g,'');
uni.navigateBack({
})
} }
} }
} }
@ -55,8 +71,8 @@
text-align: center; text-align: center;
border-radius: 5px; border-radius: 5px;
} }
.actives{ .actives {
color: #089bf5; color: #089bf5;
background-color: #f4faff; background-color: #f4faff;
border: 1px solid #089bf5; border: 1px solid #089bf5;

@ -1,5 +1,5 @@
page { page {
background: linear-gradient(to bottom, #f06c7a 0%, #f06c7a 100%); background: linear-gradient(to bottom, #0083f5 0%, #0083f5 100%);
height: 100%; height: 100%;
} }
.icon { .icon {
@ -45,15 +45,15 @@ page {
} }
.btn { .btn {
color: #f06c7a; color: #0083f5;
width: 100%; width: 100%;
margin-top: 50rpx; margin-top: 50rpx;
height: 90rpx; height: 90rpx;
display: flex; display: flex;
justify-content: center; justify-content: center;
align-items: center; align-items: center;
border-radius: 45rpx; border-radius: 45rpx;
background-color: #fff; background-color: #fff;
font-size: 40rpx; font-size: 40rpx;
} }
} }
@ -89,4 +89,4 @@ page {
height: 100upx; height: 100upx;
color: rgba($color: #ffffff, $alpha: 0.8); color: rgba($color: #ffffff, $alpha: 0.8);
} }
} }

Binary file not shown.

After

Width:  |  Height:  |  Size: 716 B

@ -73,289 +73,294 @@ $uni-font-size-title:40upx;
$uni-color-subtitle: #555555; // 二级标题颜色 $uni-color-subtitle: #555555; // 二级标题颜色
$uni-font-size-subtitle:36upx; $uni-font-size-subtitle:36upx;
$uni-color-paragraph: #3F536E; // 文章段落颜色 $uni-color-paragraph: #3F536E; // 文章段落颜色
$uni-font-size-paragraph:30upx; $uni-font-size-paragraph:30upx;
/* 字体大小 */ /* 字体大小 */
.font12 { .font12 {
font-size: 12px; font-size: 12px;
} }
.font13 { .font13 {
font-size: 13px; font-size: 13px;
} }
.font14 { .font14 {
font-size: 14px; font-size: 14px;
} }
.font15 { .font15 {
font-size: 15px; font-size: 15px;
} }
.font16 { .font16 {
font-size: 16px; font-size: 16px;
} }
.font18 { .font18 {
font-size: 18px; font-size: 18px;
} }
.font20 { .font20 {
font-size: 20px; font-size: 20px;
} }
.font24 { .font24 {
font-size: 24px; font-size: 24px;
} }
.font28 { .font28 {
font-size: 28px; font-size: 28px;
} }
// 字体加粗 // 字体加粗
.fontwig6{ .fontwig6{
font-weight: 600; font-weight: 600;
} }
/* 字体间距 */ /* 字体间距 */
.fontspec { .fontspec {
letter-spacing: 1px; letter-spacing: 1px;
} }
.fontspec10 { .fontspec10 {
letter-spacing: 10px; letter-spacing: 10px;
} }
/* 字体行间距 */ /* 字体行间距 */
.linehet { .linehet {
line-height: 20px; line-height: 20px;
} }
/* 字体位置 */ /* 字体位置 */
.fotlt { .fotlt {
text-align: left; text-align: left;
} }
.fotrt { .fotrt {
text-align: right; text-align: right;
} }
.fotct { .fotct {
text-align: center; text-align: center;
} }
.margle { .margle {
margin-left: 6px; margin-left: 6px;
} }
.paddleft10 { .paddleft10 {
margin-left: 10px; margin-left: 10px;
} }
.margle20 { .margle20 {
margin-left: 20px; margin-left: 20px;
} }
.marglerig{ .marglerig{
margin-right: 5px; margin-right: 5px;
} }
.marRight20{ .marRight20{
margin-right: 20px; margin-right: 20px;
} }
.verc { .verc {
vertical-align: middle; vertical-align: middle;
} }
.versub { .versub {
vertical-align: sub; vertical-align: sub;
} }
.text1 { .text1 {
overflow: hidden; overflow: hidden;
display: -webkit-box; display: -webkit-box;
-webkit-line-clamp: 1; -webkit-line-clamp: 1;
-webkit-box-orient: vertical; -webkit-box-orient: vertical;
text-overflow: ellipsis; text-overflow: ellipsis;
} }
.text2 { .text2 {
overflow: hidden; overflow: hidden;
display: -webkit-box; display: -webkit-box;
-webkit-line-clamp: 2; -webkit-line-clamp: 2;
-webkit-box-orient: vertical; -webkit-box-orient: vertical;
text-overflow: ellipsis; text-overflow: ellipsis;
} }
/* 字体颜色 */ /* 字体颜色 */
.fcor333 { .fcor333 {
color: #333333; color: #333333;
} }
.fcorfff { .fcorfff {
color: #ffffff; color: #ffffff;
} }
.fcor666 { .fcor666 {
color: #666666; color: #666666;
} }
.fcor999 { .fcor999 {
color: #b2b2b2; color: #b2b2b2;
} }
.fcor089 { .fcor089 {
color: #089bf5; color: #089bf5;
} }
.fcoreb5 { .fcoreb5 {
color: #eb5823; color: #eb5823;
} }
.fcorred{ .fcorred{
color: red; color: red;
} }
.fcor41c{ .fcor41c{
color: #41cda2; color: #41cda2;
} }
/* 背景颜色 */ /* 背景颜色 */
.backcor9 { .backcor9 {
background-color: #f6f6f6; background-color: #f6f6f6;
} }
.backcor9 { .backcor9 {
background-color: #f6f6f6; background-color: #f6f6f6;
} }
.backcorf06{ .backcorf06{
background-color: #f06c7a; background-color: #0083f5;
} }
.backcor008{ .backcor008{
background-color: #0083f5; background-color: #0083f5;
} }
.backcor89 { .backcor89 {
background-color: #089bf5; background-color: #089bf5;
} }
.backcorfff { .backcorfff {
background-color: white; background-color: white;
} }
.backshare { .backshare {
background: rgba(0, 0, 0, 0); background: rgba(0, 0, 0, 0);
} }
/* 页面布局 */ /* 页面布局 */
.width90 { .width90 {
width: 90%; width: 90%;
margin-left: 5%; margin-left: 5%;
} }
.width80 { .width96 {
width: 80%; width: 96%;
margin-left: 10%; margin-left: 2%;
}
.width80 {
width: 80%;
margin-left: 10%;
} }
.width80p { .width80p {
width: 80%; width: 80%;
} }
.width70 { .width70 {
width: 70%; width: 70%;
} }
.width85 { .width85 {
width: 85%; width: 85%;
} }
.width50 { .width50 {
width: 50%; width: 50%;
} }
.width40 { .width40 {
width: 40%; width: 40%;
} }
.width60 { .width60 {
width: 65%; width: 60%
margin-left: 5%; }
}
.width60w {
.width60w { width: 60%;
width: 60%; margin-left: 20%;
margin-left: 20%; }
}
.width30 {
.width30 { width: 30%;
width: 30%; }
}
.width20 {
.width20 { width: 20%;
width: 20%; }
}
.width15 {
.width15 { width: 15%;
width: 15%; }
} .width8 {
.width8 { width: 8%;
width: 8%; }
}
.width95 {
.width95 { width: 95%;
width: 95%; }
}
.width100 {
.width100 { width: 100%;
width: 100%; }
}
.bor-botm1 {
.bor-botm1 { border-bottom: 1px solid #f4f4f4;
border-bottom: 1px solid #f4f4f4; }
}
/* 高40px */
/* 高40px */ .height45 {
.height45 { height: 45px;
height: 45px; }
}
.height22{
.height22{ height: 22px;
height: 22px; }
}
.height100 {
.height100 { height: 100%;
height: 100%; }
}
.height10 {
.height10 { height: 10px;
height: 10px; }
}
.height60 {
.height60 { height: 60px;
height: 60px; }
}
.height90 {
.height90 { height: 90px;
height: 90px; }
}
.height100p { .height100p {
height: 100px; height: 100px;
} }
.height120{ .height120{
height: 120px; height: 120px;
} }
@ -366,167 +371,170 @@ $uni-font-size-paragraph:30upx;
.height180{ .height180{
height: 180px; height: 180px;
} }
.height30 { .height30 {
height: 30px; height: 30px;
line-height: 30px; line-height: 30px;
} }
.height40 { .height40 {
height: 40px; height: 40px;
line-height: 40px; line-height: 40px;
} }
.heightl60 { .heightl60 {
height: 60px; height: 60px;
line-height: 60px; line-height: 60px;
} }
.height20 { .height20 {
height: 20px; height: 20px;
line-height: 20px; line-height: 20px;
} }
.height25 { .height25 {
height: 25px; height: 25px;
} }
.height20 { .height20 {
height: 20px; height: 20px;
line-height: 20px; line-height: 20px;
} }
.height50 { .height50 {
height: 50px; height: 50px;
line-height: 50px; line-height: 50px;
} }
/* 向上下外间距 */ /* 向上下外间距 */
.mart90 { .margle10{
margin-top: 90px; margin-left: 10px;
} }
.mart90 {
.mart80{ margin-top: 90px;
margin-top: 80px; }
}
.mart60{ .mart80{
margin-top: 60px; margin-top: 80px;
} }
.mart60{
.mart50 { margin-top: 60px;
margin-top: 50px; }
}
.mart50 {
.mart40 { margin-top: 50px;
margin-top: 40px; }
}
.mart40 {
.mart30 { margin-top: 40px;
margin-top: 30px; }
}
.mart30 {
.mart15 { margin-top: 30px;
margin-top: 15px; }
}
.mart15 {
.mart20 { margin-top: 15px;
margin-top: 20px; }
}
.mart20 {
.mart10 { margin-top: 20px;
margin-top: 10px; }
}
.mart10 {
.mart5 { margin-top: 10px;
margin-top: 5px; }
}
.mart5 {
.mart1 { margin-top: 5px;
margin-top: 1px; }
}
.mart1 {
.marb65 { margin-top: 1px;
margin-bottom: 65px; }
}
.marb65 {
.marb50 { margin-bottom: 65px;
margin-bottom: 50px; }
}
.marb50 {
.marb40 { margin-bottom: 50px;
margin-bottom: 40px; }
}
.marb40 {
.marb30 { margin-bottom: 40px;
margin-bottom: 30px; }
}
.marb30 {
.marb20 { margin-bottom: 30px;
margin-bottom: 20px; }
}
.marb20 {
.marb10 { margin-bottom: 20px;
margin-bottom: 10px; }
}
.marb10 {
.marb5 { margin-bottom: 10px;
margin-bottom: 5px; }
}
.marb5 {
margin-bottom: 5px;
}
/* 向上下内间距 */ /* 向上下内间距 */
.paddtop5 { .paddtop5 {
padding-top: 5px; padding-top: 5px;
} }
.paddtop10 { .paddtop10 {
padding-top: 10px; padding-top: 10px;
} }
.paading10{ .paading10{
padding : 10px; padding : 10px;
} }
.paddtop13 { .paddtop13 {
padding-top: 13px; padding-top: 13px;
} }
.paddtop15 { .paddtop15 {
padding-top: 15px; padding-top: 15px;
} }
.paddtop25 { .paddtop25 {
padding-top: 25px; padding-top: 25px;
} }
.paddleft10 { .paddleft10 {
padding-left: 10px; padding-left: 10px;
} }
.padleft15 { .padleft15 {
padding-left: 15px; padding-left: 15px;
} }
.paddtright10 { .paddtright10 {
padding-right: 10px; padding-right: 10px;
} }
.paddbotm10 { .paddbotm10 {
padding-bottom: 10px; padding-bottom: 10px;
} }
/* 左悬浮 */ /* 左悬浮 */
.flleft { .flleft {
float: left; float: left;
} }
/* 右悬浮 */ /* 右悬浮 */
.flright { .flright {
float: right; float: right;
} }
/** /**
* 圆角 * 圆角
@ -534,47 +542,47 @@ $uni-font-size-paragraph:30upx;
.border-r{ .border-r{
border-radius: 5px; border-radius: 5px;
} }
/* button样式 */ /* button样式 */
.btnw70 { .btnw70 {
width: 70%; width: 70%;
color: white; color: white;
margin-top: 40px; margin-top: 40px;
background-color: #089bf5; background-color: #089bf5;
border-radius: 6px; border-radius: 6px;
} }
.btnw50 { .btnw50 {
width: 50%; width: 50%;
margin-left: 25%; margin-left: 25%;
height: 45px; height: 45px;
line-height: 45px; line-height: 45px;
color: white; color: white;
text-align: center; text-align: center;
margin-top: 40px; margin-top: 40px;
background-color: #f06c7a; background-color: #0083f5;
border-radius: 6px; border-radius: 6px;
} }
/* 下滑线 */ /* 下滑线 */
.line1 { .line1 {
height: 1px; height: 1px;
background-color: #f4f4f4; background-color: #f4f4f4;
} }
.line10 { .line10 {
height: 10px; height: 10px;
background-color: #f4f4f4; background-color: #f4f4f4;
} }
.line1089 { .line1089 {
height: 10px; height: 10px;
background-color: #089bf5; background-color: #089bf5;
} }
/* 展示样式 */ /* 展示样式 */
.displ { .displ {
display: inline-block; display: inline-block;
} }
.font12{ .font12{

Loading…
Cancel
Save