1.在线加油修改问题

2.新增我的推广,分销功能
yj-dev
杨杰 2 years ago
parent afe3002f72
commit 0fe1631877
  1. 27
      Utils/Api.js
  2. 45
      pages.json
  3. 2
      pages/goods/refuel-confirm/refuel-confirm.vue
  4. 45
      pages/goods/refuel-details/refuel-details.vue
  5. 6
      pages/goods/refuel/refuel.vue
  6. 8
      pages/login/register.vue
  7. 25
      pages/order/confirmation.vue
  8. 2
      pages/qianZhuPay/union-pay/union-pay.vue
  9. 2
      pages/tabBar/category/category.vue
  10. 27
      pages/tabBar/home/home.vue
  11. 30
      pages/tabBar/user/user.vue
  12. 34
      pages/user/generatePoster/generatePoster.vue
  13. 291
      pages/user/myPromotion/myPromotion.vue
  14. 22
      pages/user/order_list/order_list.vue
  15. 51
      pages/welcome/welcome.vue
  16. 1
      qianzhu-KFC/order-details/order-details.vue
  17. BIN
      static/img/user/1.png
  18. BIN
      static/img/user/2.png
  19. 3
      subPages/rechargeDetails/rechargeDetails.vue
  20. 63
      subPages/selectEntry/selectEntry.vue
  21. 7
      uni.scss

@ -400,7 +400,26 @@ export const getMemberProducts = params => {
return POST('GET', `${base}/highThirdParty/getMemberProducts`, params).then(res => res.data); return POST('GET', `${base}/highThirdParty/getMemberProducts`, params).then(res => res.data);
} }
//分销统计数据
export const userDistributionStatistics = params => {
return POST('GET', `${base}/highUser/userDistributionStatistics`, params).then(res => res.data);
}
//邀请列表
export const distributionInviteList = params => {
return POST('GET', `${base}/highUser/distributionInviteList`, params).then(res => res.data);
}
//分销用户积分列表
export const distributionOrderList = params => {
return POST('GET', `${base}/highUser/distributionOrderList`, params).then(res => res.data);
}
//分销用户积分列表
export const promoteOrderList = params => {
return POST('GET', `${base}/highUser/promoteOrderList`, params).then(res => res.data);
}
//生成海报
export const promotionalPosters = params => {
return POST('GET', `${base}/highUser/promotionalPosters`, params).then(res => res.data);
}
export const qzOrderToPay = params => { export const qzOrderToPay = params => {
return POST('POST', `${base}/order/qzOrderToPay`, params).then(res => res.data); return POST('POST', `${base}/order/qzOrderToPay`, params).then(res => res.data);
@ -417,6 +436,12 @@ export const cancelOrderByOrderNo = params => {
/** /**
* H5 获取用户信息 * H5 获取用户信息
*/ */
//h5静默登陆
export const loginBySilence = params => {
return POST('GET', `${base}/wechat/loginBySilence`, params).then(res => res.data);
}
export const getH5UserInfo = params => { export const getH5UserInfo = params => {
return POST('GET', `${base}/wechat/getH5UserInfo`, params).then(res => res.data); return POST('GET', `${base}/wechat/getH5UserInfo`, params).then(res => res.data);
} }

@ -1,14 +1,13 @@
{ {
"pages": [ //pageshttps://uniapp.dcloud.io/collocation/pages "pages": [ //pageshttps://uniapp.dcloud.io/collocation/pages
{ {
"path" : "pages/welcome/welcome", "path": "pages/welcome/welcome",
"style" : "style": {
{
"navigationBarTitleText": "", "navigationBarTitleText": "",
"enablePullDownRefresh": false "enablePullDownRefresh": false
} }
},{ }, {
"path": "pages/tabBar/home/home", "path": "pages/tabBar/home/home",
"style": { "style": {
"navigationBarTextStyle": "white", "navigationBarTextStyle": "white",
@ -469,17 +468,35 @@
"backgroundColorTop": "#0083f5", "backgroundColorTop": "#0083f5",
"navigationBarTextStyle": "white" "navigationBarTextStyle": "white"
} }
} }, {
,{ "path": "pages/userLogin/agreement/agreement",
"path" : "pages/userLogin/agreement/agreement", "style": {
"style" :
{
"navigationBarTitleText": "", "navigationBarTitleText": "",
"enablePullDownRefresh": false "enablePullDownRefresh": false
} }
} }
, {
"path": "pages/user/myPromotion/myPromotion",
"style": {
"enablePullDownRefresh": false,
"navigationBarTitleText": "我的推广",
"backgroundTextStyle": "light"
// "navigationBarBackgroundColor": "#44AE3F",
// "backgroundColorTop": "#44AE3F",
// "navigationBarTextStyle": "white"
}
}, {
"path": "pages/user/generatePoster/generatePoster",
"style": {
"navigationBarTitleText": "查看海报",
"enablePullDownRefresh": false
}
}
], ],
"subpackages": [{ "subpackages": [{
"root": "subPages", "root": "subPages",
@ -775,6 +792,16 @@
"onReachBottomDistance": 50 "onReachBottomDistance": 50
} }
}, {
"path": "selectEntry/selectEntry",
"style": {
"navigationBarTitleText": "",
"enablePullDownRefresh": false,
"app-plus": {
"titleNView": false //
}
}
} }
] ]
}, { }, {

@ -265,7 +265,7 @@
}, },
onShow() { onShow() {
let that = this; let that = this;
that.paytype = ''; // that.paytype = '';
that.findUser(); that.findUser();
}, },
methods: { methods: {

@ -72,6 +72,14 @@
{{oilLiters}}L {{oilLiters}}L
</view> </view>
</view> </view>
<!-- <view class="list width90">
<view class="box" v-for="(amount,index) in amountList" :key="index" @click="select(amount)"
:class="{'on':amount.price == inputMoney}">
<view class="heTitle fcor333" :class="{'fcor089':amount.id == inputAmount}">{{amount.price}}</view>
</view>
</view> -->
<!-- 详情描述--> <!-- 详情描述-->
<view class="line10 mart15"></view> <view class="line10 mart15"></view>
<!-- <view class="width90 height40 mart10"> <!-- <view class="width90 height40 mart10">
@ -97,12 +105,7 @@
¥{{totalPreferences}}</text></view> ¥{{totalPreferences}}</text></view>
</view> </view>
<view class="line10 mart15"></view> <view class="line10 mart15"></view>
<!-- <view class="list width90">
<view class="box" v-for="(amount,index) in amountList" :key="index" @click="select(amount)"
:class="{'on':amount.price == inputMoney}">
<view class="heTitle fcor333" :class="{'fcor089':amount.id == inputAmount}">{{amount.price}}</view>
</view>
</view> -->
<view class="height60 width100"></view> <view class="height60 width100"></view>
<!-- 底部按钮 --> <!-- 底部按钮 -->
<view class="footer"> <view class="footer">
@ -254,12 +257,14 @@
methods: { methods: {
// //
seeloaction() { seeloaction() {
// #ifdef MP
uni.openLocation({ uni.openLocation({
latitude: Number(this.storeList.gasAddressLatitude), // latitude: Number(this.storeList.gasAddressLatitude), //
longitude: Number(this.storeList.gasAddressLongitude), // longitude: Number(this.storeList.gasAddressLongitude), //
name: this.storeList.gasName, name: this.storeList.gasName,
address: this.storeList.gasAddress address: this.storeList.gasAddress
}) })
// #endif
}, },
// //
showPopup(item) { showPopup(item) {
@ -323,13 +328,24 @@
this.storeList = res.return_data; this.storeList = res.return_data;
if (!this.oilNo || this.oilNo == undefined) { if (!this.oilNo || this.oilNo == undefined) {
this.oilNo = res.return_data.oilPriceList[0].oilNoName; this.oilNo = res.return_data.oilPriceList[0].oilNoName;
}
this.priceVip = res.return_data.oilPriceList[0].priceVip; this.priceVip = res.return_data.oilPriceList[0].priceVip;
this.priceGun = res.return_data.oilPriceList[0].priceGun; this.priceGun = res.return_data.oilPriceList[0].priceGun;
this.priceOfficial = res.return_data.oilPriceList[0].priceOfficial; this.priceOfficial = res.return_data.oilPriceList[0].priceOfficial;
this.oilType = res.return_data.oilPriceList[0].oilType;
} else {
let oillist = res.return_data.oilPriceList;
for (var i = 0; i < oillist.length; i++) {
if (this.oilNo == oillist[i].oilNoName) {
this.priceVip = oillist[i].priceVip;
this.priceGun = oillist[i].priceGun;
this.priceOfficial = oillist[i].priceOfficial;
this.oilType = oillist[i].oilType;
}
}
}
this.detailList = res.return_data.oilPriceList; this.detailList = res.return_data.oilPriceList;
this.counId = res.return_data.goodsId; this.counId = res.return_data.goodsId;
this.oilType = res.return_data.oilPriceList[0].oilType;
this.gasGunList = res.return_data.gasGunList; this.gasGunList = 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) {
@ -417,15 +433,10 @@
// this.totalPreferences = '0'; // this.totalPreferences = '0';
this.$refs.popup.hide(); this.$refs.popup.hide();
}, },
// select(amount) { select(amount) {
// this.inputMoney = amount.price; this.inputMoney = amount.price;
// this.litre = parseFloat(amount.price / this.priceGun).toFixed(2); this.oilPriceDiscountCompute();
// this.totalPrice = parseFloat(amount.price / this.priceGun * this.priceVip).toFixed(2); },
// if (this.priceVip != this.priceGun) {
// let gbprice = parseFloat(this.litre * this.priceOfficial).toFixed(2);
// this.discountPrice = parseFloat(gbprice - this.inputMoney).toFixed(2);
// }
// },
// H5 // H5
jumpH5Bding() { jumpH5Bding() {
uni.navigateTo({ uni.navigateTo({

@ -191,12 +191,18 @@
}, },
seeloaction(item) { seeloaction(item) {
// #ifdef H5
// window.location.href =
// `http://apis.map.qq.com/uri/v1/marker?marker=coord:(${item.latitude},${item.longitude})&addr:${item.address}`;
// #endif
// #ifdef MP
uni.openLocation({ uni.openLocation({
latitude: Number(item.latitude), // latitude: Number(item.latitude), //
longitude: Number(item.longitude), // longitude: Number(item.longitude), //
name: item.store_name, name: item.store_name,
address: item.address address: item.address
}) })
// #endif
}, },
changeValue1(item) { changeValue1(item) {
this.distanceName = item.name; this.distanceName = item.name;

@ -146,9 +146,15 @@
uni.showLoading({ uni.showLoading({
title: '提交中...' title: '提交中...'
}) })
let userid = '';
if (app.globalData.accountId == '000009&key' || app.globalData.accountId == '0000010&key') {
userid = app.globalData.staffCode;
}
let params = { let params = {
phone: this.phoneNumber, phone: this.phoneNumber,
code: this.code code: this.code,
popularizeUserId: userid,
regionId: app.globalData.cityId
} }
H5login(params).then(res => { H5login(params).then(res => {
uni.hideLoading(); uni.hideLoading();

@ -88,6 +88,13 @@
</view> </view>
</view> </view>
<view class="width94 backcorfff mart10">
<view class="width94 alijusstart height50 font14 fcor666">
<view class="width40 fcor333 fontwig6 font16" style="padding-left: 2%;">邀请码</view>
<input class="width60 fotrt font15" v-model="identificationCode" placeholder="请输入邀请码" />
</view>
</view>
<view class="width94 comorder mart10"> <view class="width94 comorder mart10">
<view class="height50 width100 backcorfff"> <view class="height50 width100 backcorfff">
<view class="width100 flleft fcor333 fontwig6 font16" style="padding-left: 4%;"> <view class="width100 flleft fcor333 fontwig6 font16" style="padding-left: 4%;">
@ -131,6 +138,8 @@
</view> </view>
</view> </view>
<!-- <view class="width94 comorder mart10"> <!-- <view class="width94 comorder mart10">
<view class="height50 width100 backcorfff"> <view class="height50 width100 backcorfff">
<view class="width80p flleft fcor333 fontwig6 font14" style="padding-left: 4%;"> <view class="width80p flleft fcor333 fontwig6 font14" style="padding-left: 4%;">
@ -233,11 +242,18 @@
isDiscont: false, isDiscont: false,
coupondiscountid: '', coupondiscountid: '',
orderDetails: '', // orderDetails: '', //
payGold: '' // payGold: '', //
identificationCode: '' //
}; };
}, },
onLoad(option) { onLoad(option) {
this.couponId = option.id; this.couponId = option.id;
// #ifdef H5
this.identificationCode = app.globalData.staffCode;
// #endif
// #ifdef MP
this.identificationCode = app.globalData.identificationCode;
// #endif
this.getCouponById(); this.getCouponById();
}, },
onShow() { onShow() {
@ -281,7 +297,7 @@
if (res.return_code == '000000') { if (res.return_code == '000000') {
app.globalData.userInfo = res.return_data; app.globalData.userInfo = res.return_data;
this.user = res.return_data; this.user = res.return_data;
if(this.user.hltCardNo){ if (this.user.hltCardNo) {
this.getHuiLianTongCardBalance(); this.getHuiLianTongCardBalance();
} }
this.getUserNormalDiscountList(); this.getUserNormalDiscountList();
@ -434,7 +450,7 @@
} }
let goods = { let goods = {
"memDiscountId": this.coupondiscountid, "memDiscountId": this.coupondiscountid,
"identificationCode": app.globalData.identificationCode, "identificationCode": this.identificationCode,
"payGold": this.payGold, "payGold": this.payGold,
"highChildOrderList": [{ "highChildOrderList": [{
"goodsType": 1, "goodsType": 1,
@ -607,7 +623,8 @@
app.globalData.storeid = ''; app.globalData.storeid = '';
app.globalData.storename = ''; app.globalData.storename = '';
uni.reLaunch({ uni.reLaunch({
url: '../pay/success/success?id=' + that.couponId url: '../pay/success/success?id=' +
that.couponId
}); });
}, },
fail: function(err) { fail: function(err) {

@ -72,7 +72,7 @@
codes: '', codes: '',
isShowModal: false, isShowModal: false,
inputSerialNum: '', inputSerialNum: '',
url: 'https://base.95516.com/s/wl/WebAPP/helpAgree/page/help/shareRutineHelp.html?params=eyJlbmNyeXB0QXBwSWQiOiIxOTAwYmM4NDQ5N2NhYjNiIiwidG9MaW5rIjoiaHR0cHMlM0ElMkYlMkZoc2cuZGN0cGF5LmNvbSUyRnVuaW9uUGF5JTJGIn0' url: 'https://base.95516.com/s/wl/WebAPP/helpAgree/page/help/shareRutineHelp.html?params=eyJlbmNyeXB0QXBwSWQiOiI3MzcxZmM2M2JhNTRjODk1IiwidG9MaW5rIjoiaHR0cHMlM0ElMkYlMkZoc2cuZGN0cGF5LmNvbSUyRnVuaW9uUGF5JTJGIn0='
} }
}, },

@ -62,7 +62,9 @@
</view> </view>
</wybPopup> --> </wybPopup> -->
<!-- #ifdef MP--> <!-- #ifdef MP-->
<button open-type="contact">
<image :src="imagewxUrl+imgadres5" mode="widthFix" class="xfimg"></image> <image :src="imagewxUrl+imgadres5" mode="widthFix" class="xfimg"></image>
</button>
<!-- #endif --> <!-- #endif -->
<!-- #ifdef H5--> <!-- #ifdef H5-->
<image :src="imagewxUrl+imgadres5" mode="widthFix" class="h5xfimg" @click="playPhone"></image> <image :src="imagewxUrl+imgadres5" mode="widthFix" class="h5xfimg" @click="playPhone"></image>

@ -223,7 +223,7 @@
success(e) { success(e) {
if (e.data) { if (e.data) {
if (app.globalData.accountId == '000001&key' || app.globalData.accountId == if (app.globalData.accountId == '000001&key' || app.globalData.accountId ==
'000000&gasKey') { '000000&gasKey' || app.globalData.accountId == '000009&key' || app.globalData.accountId == '0000010&key') {
app.globalData.staffCode = e.data; app.globalData.staffCode = e.data;
} else { } else {
app.globalData.mchId = e.data; app.globalData.mchId = e.data;
@ -256,9 +256,9 @@
that.postionIng(); that.postionIng();
// #endif // #endif
// #ifdef H5 // #ifdef H5
if (app.globalData.h5code) { // if (app.globalData.h5code) {
that.getH5AccessToken(); // that.getH5AccessToken();
} // }
uni.showLoading({ uni.showLoading({
title: '加载中' title: '加载中'
}) })
@ -491,6 +491,10 @@
// 004 // 004
// 005 // 005
// 006 // 006
// 007 线
// 008
// 009 广
// 0010
if (e.data == '000000#/' && app.globalData.h5code) { if (e.data == '000000#/' && app.globalData.h5code) {
uni.navigateTo({ uni.navigateTo({
url: '../../goods/refuel-details/refuel-details' url: '../../goods/refuel-details/refuel-details'
@ -532,6 +536,21 @@
url: '../../../subPages/recharge/recharge' url: '../../../subPages/recharge/recharge'
}) })
} }
if (e.data == '000007&key' && app.globalData.h5code) {
uni.navigateTo({
url: '../../goods/refuel/refuel'
})
}
if (e.data == '000008&key' && app.globalData.h5code) {
uni.navigateTo({
url: '../../goods/goods-list/goods-list?id=5'
})
}
if (e.data == '000009&key' && app.globalData.h5code) {
uni.navigateTo({
url: '/subPages/selectEntry/selectEntry'
})
}
} }
} }
}) })

@ -52,11 +52,13 @@
<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: 15%;" 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>
<uni-badge style="width: 20px;position: absolute; left: 52%;" v-if="row.text == '已完成' && whetherCheckNum " :text="whetherCheckNum" <uni-badge style="width: 20px;position: absolute; left: 52%;"
type="error" size="normal"></uni-badge> v-if="row.text == '已完成' && whetherCheckNum " :text="whetherCheckNum" type="error" size="normal">
</uni-badge>
<uni-badge style="width: 20px;position: absolute; left: 33%;" v-if="row.text == '已支付' && orderPayNum " :text="orderPayNum" <uni-badge style="width: 20px;position: absolute; left: 33%;"
type="error" size="normal"></uni-badge> v-if="row.text == '已支付' && orderPayNum " :text="orderPayNum" 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>
</view> </view>
@ -168,7 +170,7 @@
therrNum: '', therrNum: '',
rechargeOrderNum: '', // rechargeOrderNum: '', //
whetherCheckNum: '', // whetherCheckNum: '', //
orderPayNum:'', // orderPayNum: '', //
headerTop: null, headerTop: null,
statusTop: null, statusTop: null,
showHeader: true, showHeader: true,
@ -250,12 +252,17 @@
url: '../../login/login?id=2', url: '../../login/login?id=2',
text: '代理商登录', text: '代理商登录',
img: 'user/renw.png' img: 'user/renw.png'
},
{
url: '/pages/user/myPromotion/myPromotion',
text: '我的推广',
img: 'user/extension.png'
} }
// , // ,
// { // {
// url: '/pages/user/Charge/Charge', // url: '/pages/user/generatePoster/generatePoster',
// text: '', // text: '',
// img: 'user/bank.png' // img: 'user/poster.png'
// } // }
], ],
// //
@ -521,7 +528,10 @@
key: "token", key: "token",
data: '' data: ''
}) })
location.reload(); // location.reload();
uni.navigateTo({
url: '/pages/login/register'
})
} }
}); });
} }
@ -884,7 +894,7 @@
.box { .box {
width: 25%; width: 25%;
margin-bottom: 30upx; margin-bottom: 40upx;
.img { .img {
width: 23vw; width: 23vw;

@ -0,0 +1,34 @@
<template>
<view>
<image :src="imgs" mode="widthFix" class="width90 mart15"></image>
</view>
</template>
<script>
import {
promotionalPosters
} from '../../../Utils/Api.js';
export default {
data() {
return {
imgs: ''
}
},
onLoad() {
this.promotionalPosters();
},
methods: {
promotionalPosters() {
promotionalPosters().then(res => {
if (res.return_code == '000000') {
this.imgs = res.return_data;
}
})
}
}
}
</script>
<style lang="scss">
</style>

@ -0,0 +1,291 @@
<template>
<view>
<image src="../../../static/img/user/1.png" class="width100 images"></image>
<view class="width100 font16 fcorfff title fotct paddtop15">今日积分收入</view>
<view class="width100 font48 fcorfff title fotct paddtop15">
{{ !distribution.toDayIntegralNum ? 0 : distribution.toDayIntegralNum}}
</view>
<view class="title paddtop15 alijus fcorfff fotct">
<view class="width30w ">
<view class="width100 font14">邀请人数</view>
<view class="width100 font18 paddtop5">
{{ !distribution.inviteeNum ? 0 : distribution.inviteeNum}}
</view>
</view>
<view class="backcorfff" style="width: 1px;height: 50px;"></view>
<view class="width30w">
<view class="width100 font14">积分收入</view>
<view class="width100 font18 paddtop5">
{{ !distribution.integralIncome ? 0 : distribution.integralIncome}}
</view>
</view>
<view class="backcorfff" style="width: 1px;height: 50px;"></view>
<view class="width30w">
<view class="width100 font14">积分笔数</view>
<view class="width100 font18 paddtop5">{{ !distribution.orderCount ? 0 : distribution.orderCount}}
</view>
</view>
</view>
<view class="font14 width20w fcorfff title fotct mart10"
style="padding: 3px 5px;border-radius: 15px;border: 1px solid;" @click="jumpmypro()">我的邀请码</view>
<view class="width90 mart40 alijus ">
<view class="font14 fcor666 paddtop5 paddbotm5 margle20 marRight20" v-for="(item,index) in cateTypeList"
@click="switchid(item)" :class="[goodtyid == item.id ? 'fon62ac borbtom fontwig6 font16' : '']"
:key="index">
{{item.title}}
</view>
</view>
<view class="alijus width90 fotct mart20 font14 fcor666" v-if="goodtyid == 1">
<view class="width30w fotlt">
名称
</view>
<view class="width30w">
电话
</view>
<view class="width30w">
邀请时间
</view>
</view>
<view class="width100" v-if="goodtyid == 1">
<view v-if="dataslist == '' " class="mart60 fotct font14 fcor666">
<image mode="widthFix" style="width: 70vw;" :src="imagewxUrl+imgadres"></image>
</view>
<view class="alijus width90 fotct mart15 font14 fcor999" v-for="(item,index) in dataslist" :key="index">
<view class="width30w fotlt">
{{item.userName}}
</view>
<view class="width30w fotlt">
{{item.phone}}
</view>
<view class="width30w">
{{item.createTime | timeFormat('yyyy-mm-dd hh:mm:ss')}}
</view>
</view>
</view>
<view class="width100" v-if="goodtyid == 2">
<view v-if="integralList == '' " class="mart60 fotct font14 fcor666">
<image mode="widthFix" style="width: 70vw;" :src="imagewxUrl+imgadres"></image>
</view>
<view class="alijus width94 mart15 font14 fcor999" v-for="(item,index) in integralList" :key="index">
<image :src="imageUrl+item.ext1" class="icon40" mode="widthFix"></image>
<view class="width85 bor-botm1">
<view class="width100 alijusstart">
<view class="width70 fcor333 paddleft10">{{item.title}}</view>
<view class="width30 fcor333 fontwig6 font20 fotrt">+{{item.integralNum}}</view>
</view>
<view class="width100 fcor999 font13 paddleft10 paddbotm5">
{{item.ext3}} | {{item.userName}}
</view>
</view>
</view>
</view>
<view class="width100" v-if="goodtyid == 3">
<view v-if="distrOrderList == '' " class="mart60 fotct font14 fcor666">
<image mode="widthFix" style="width: 70vw;" :src="imagewxUrl+imgadres"></image>
</view>
<view class="alijus width100 mart15 font14 fcor999" v-for="(item,index) in distrOrderList" :key="index">
<view class="width100 bor-botm1 paddleft5 paddtright10">
<view class="width100 alijusstart">
<view class="width70 fcor333 paddleft10">{{item.goodsTypeName}}</view>
<view class="width30 fcor333 fontwig6 font20 fotrt">¥{{item.totalPrice}}</view>
</view>
<view class="width100 fcor999 font13 paddleft10 paddbotm5">
{{item.time}} {{item.memName}}
</view>
</view>
</view>
</view>
<view class="height45"></view>
</view>
</template>
<script>
import {
userDistributionStatistics,
distributionInviteList,
distributionOrderList,
promoteOrderList
} from '../../../Utils/Api.js'
let app = getApp();
export default {
data() {
return {
imagewxUrl: app.globalData.imageWxImg,
imageUrl:app.globalData.imgUrl,
imgadres: 'noorder.png',
cateTypeList: [{
id: 1,
title: '邀请列表'
},
{
id: 2,
title: '积分记录'
}, {
id: 3,
title: '推广记录'
},
],
goodtyid: 1, //
dataslist: [], //
distrOrderList: [], //
distribution: '', //
integralList: [], //
pageNum: 1,
pageSize: 10,
isNoMoreData: false,
}
},
onLoad() {
this.userDistributionStatistics();
this.distributionInviteList();
},
methods: {
//
jumpmypro() {
uni.navigateTo({
url: '/pages/user/generatePoster/generatePoster'
})
},
//id
switchid(item) {
this.goodtyid = item.id;
if (item.id == 1) {
this.pageNum = 1;
this.dataslist = [];
this.isNoMoreData = false;
this.distributionInviteList();
} else if (item.id == 2) {
this.pageNum = 1;
this.integralList = [];
this.isNoMoreData = false;
this.distributionOrderList();
} else if (item.id == 3) {
this.pageNum = 1;
this.distrOrderList = [];
this.isNoMoreData = false;
this.promoteOrderList();
}
},
//
userDistributionStatistics() {
uni.showLoading({
title: '加载中...'
})
userDistributionStatistics().then(res => {
if (res.return_code == '000000') {
this.distribution = res.return_data;
uni.hideLoading();
}
})
},
//
distributionInviteList() {
uni.showLoading({
title: '加载中...'
})
if (this.isNoMoreData) {
uni.hideLoading();
return false;
}
let pagenum = this.pageNum;
let params = {
pageNum: pagenum,
pageSize: this.pageSize,
}
distributionInviteList(params).then(res => {
uni.hideLoading();
if (res.return_code == '000000') {
this.isNoMoreData = res.return_data.list.length == this.pageSize ? false : true;
this.dataslist = this.dataslist.concat(res.return_data.list);
if (res.return_data.total == (this.pageNum * this.pageSize)) {
this.isNoMoreData = true;
}
this.pageNum = res.return_data.list.length == this.pageSize ? ++pagenum : pagenum;
} else {
this.dataslist = [];
}
})
},
//
distributionOrderList() {
uni.showLoading({
title: '加载中...'
})
if (this.isNoMoreData) {
uni.hideLoading()
return false;
}
let pagenum = this.pageNum;
let params = {
pageNum: pagenum,
pageSize: this.pageSize,
}
distributionOrderList(params).then(res => {
uni.hideLoading();
if (res.return_code == '000000') {
this.isNoMoreData = res.return_data.list.length == this.pageSize ? false : true;
this.integralList = this.integralList.concat(res.return_data.list);
if (res.return_data.total == (this.pageNum * this.pageSize)) {
this.isNoMoreData = true;
}
this.pageNum = res.return_data.list.length == this.pageSize ? ++pagenum : pagenum;
} else {
this.integralList = [];
}
})
},
//
promoteOrderList() {
uni.showLoading({
title: '加载中...'
})
if (this.isNoMoreData) {
uni.hideLoading()
return false;
}
let pagenum = this.pageNum;
let params = {
pageNum: pagenum,
pageSize: this.pageSize,
}
promoteOrderList(params).then(res => {
uni.hideLoading();
if (res.return_code == '000000') {
this.isNoMoreData = res.return_data.list.length == this.pageSize ? false : true;
this.distrOrderList = this.distrOrderList.concat(res.return_data.list);
if (res.return_data.total == (this.pageNum * this.pageSize)) {
this.isNoMoreData = true;
}
this.pageNum = res.return_data.list.length == this.pageSize ? ++pagenum : pagenum;
} else {
this.distrOrderList = [];
}
})
}
}
}
</script>
<style lang="scss">
.images {
position: absolute;
height: 235px;
}
.title {
position: relative;
}
.borbtom {
border-bottom: 3px solid #62ac4e;
}
.fon62ac {
color: #62ac4e;
}
</style>

@ -14,61 +14,61 @@
</view> </view>
<view class="row" v-for="(row,index) in orderList" :key="index"> <view class="row" v-for="(row,index) in orderList" :key="index">
<view class="width96 height40" @click="jumpDetails(row.highChildOrderList[0].goodsType,row.id)"> <view class="width96 height40" @click="jumpDetails(row.highChildOrderList[0].goodsType,row.id)">
<view class="width50 flleft aliitem fotlt font16" <view class="width40 flleft aliitem fotlt font16"
v-if="row.highChildOrderList[0].goodsType == 1"> v-if="row.highChildOrderList[0].goodsType == 1">
<image src="../../../static/img/order2.png" class="marglerig" <image src="../../../static/img/order2.png" class="marglerig"
style="width: 50rpx;height: 50rpx;"></image> style="width: 50rpx;height: 50rpx;"></image>
卡券订单 <view class="unread" v-if="row.orderStatus == 3 && !row.whetherCheck"></view> 卡券订单 <view class="unread" v-if="row.orderStatus == 3 && !row.whetherCheck"></view>
</view> </view>
<view class="width50 flleft aliitem fotlt font16" <view class="width40 flleft aliitem fotlt font16"
v-if="row.highChildOrderList[0].goodsType == 2"> v-if="row.highChildOrderList[0].goodsType == 2">
<image src="../../../static/img/order2.png" class="marglerig" <image src="../../../static/img/order2.png" class="marglerig"
style="width: 50rpx;height: 50rpx;"></image> style="width: 50rpx;height: 50rpx;"></image>
积分充值<view class="unread" v-if="row.orderStatus == 3 && !row.whetherCheck"></view> 积分充值<view class="unread" v-if="row.orderStatus == 3 && !row.whetherCheck"></view>
</view> </view>
<view class="width50 flleft aliitem fotlt font16" <view class="width40 flleft aliitem fotlt font16"
v-if="row.highChildOrderList[0].goodsType == 7"> v-if="row.highChildOrderList[0].goodsType == 7">
<image src="../../../static/img/order9.png" class="marglerig" <image src="../../../static/img/order9.png" class="marglerig"
style="width: 50rpx;height: 50rpx;"></image> style="width: 50rpx;height: 50rpx;"></image>
优惠券包<view class="unread" v-if="row.orderStatus == 3 && !row.whetherCheck"></view> 优惠券包<view class="unread" v-if="row.orderStatus == 3 && !row.whetherCheck"></view>
</view> </view>
<view class="width50 flleft aliitem fotlt font16" <view class="width40 flleft aliitem fotlt font16"
v-if="row.highChildOrderList[0].goodsType == 3"> v-if="row.highChildOrderList[0].goodsType == 3">
<image src="../../../static/img/order4.png" class="marglerig" <image src="../../../static/img/order4.png" class="marglerig"
style="width: 50rpx;height: 50rpx;"></image> style="width: 50rpx;height: 50rpx;"></image>
油订单<view class="unread" v-if="row.orderStatus == 3 && !row.whetherCheck"></view> 油订单<view class="unread" v-if="row.orderStatus == 3 && !row.whetherCheck"></view>
</view> </view>
<view class="width50 flleft aliitem fotlt font16" <view class="width40 flleft aliitem fotlt font16"
v-if="row.highChildOrderList[0].goodsType == 5"> v-if="row.highChildOrderList[0].goodsType == 5">
<image src="../../../static/img/order5.png" class="marglerig" <image src="../../../static/img/order5.png" class="marglerig"
style="width: 50rpx;height: 50rpx;"></image> style="width: 50rpx;height: 50rpx;"></image>
电影票<view class="unread" v-if="row.orderStatus == 3 && !row.whetherCheck"></view> 电影票<view class="unread" v-if="row.orderStatus == 3 && !row.whetherCheck"></view>
</view> </view>
<view class="width50 flleft aliitem fotlt font16" <view class="width40 flleft aliitem fotlt font16"
v-if="row.highChildOrderList[0].goodsType == 4"> v-if="row.highChildOrderList[0].goodsType == 4">
<image src="../../../static/img/order3.png" class="marglerig" <image src="../../../static/img/order3.png" class="marglerig"
style="width: 50rpx;height: 50rpx;"></image> style="width: 50rpx;height: 50rpx;"></image>
KFC<view class="unread" v-if="row.orderStatus == 3 && !row.whetherCheck"></view> KFC<view class="unread" v-if="row.orderStatus == 3 && !row.whetherCheck"></view>
</view> </view>
<view class="width50 flleft aliitem fotlt font16" <view class="width40 flleft aliitem fotlt font16"
v-if="row.highChildOrderList[0].goodsType == 9"> v-if="row.highChildOrderList[0].goodsType == 9">
<image src="../../../static/img/xbk.png" class="marglerig" <image src="../../../static/img/xbk.png" class="marglerig"
style="width: 50rpx;height: 50rpx;"></image> style="width: 50rpx;height: 50rpx;"></image>
星巴克<view class="unread" v-if="row.orderStatus == 3 && !row.whetherCheck"></view> 星巴克<view class="unread" v-if="row.orderStatus == 3 && !row.whetherCheck"></view>
</view> </view>
<view class="width50 flleft aliitem fotlt font16" <view class="width40 flleft aliitem fotlt font16"
v-if="row.highChildOrderList[0].goodsType == 10"> v-if="row.highChildOrderList[0].goodsType == 10">
<image src="../../../static/img/Vip.png" class="marglerig" <image src="../../../static/img/Vip.png" class="marglerig"
style="width: 50rpx;height: 50rpx;"></image> style="width: 50rpx;height: 50rpx;"></image>
会员充值<view class="unread" v-if="row.orderStatus == 3 && !row.whetherCheck"></view> 会员充值<view class="unread" v-if="row.orderStatus == 3 && !row.whetherCheck"></view>
</view> </view>
<view class="width50 flleft aliitem fotlt font16" <view class="width40 flleft aliitem fotlt font16"
v-if="row.highChildOrderList[0].goodsType == 8"> v-if="row.highChildOrderList[0].goodsType == 8">
<image src="../../../static/img/ghkpay.png" class="marglerig" <image src="../../../static/img/ghkpay.png" class="marglerig"
style="width: 50rpx;height: 50rpx;"></image> style="width: 50rpx;height: 50rpx;"></image>
工会卡充值<view class="unread" v-if="row.orderStatus == 3 && !row.whetherCheck"></view> 工会卡充值<view class="unread" v-if="row.orderStatus == 3 && !row.whetherCheck"></view>
</view> </view>
<view class="width50 flright fotrt fcor666 font15"> <view class="width60 flright fotrt fcor666 font15">
{{row.createTime | formatDate('-')}} {{row.createTime | formatDate('-')}}
</view> </view>
</view> </view>

@ -5,6 +5,10 @@
</template> </template>
<script> <script>
import {
loginBySilence,
getH5AccessToken
} from '../../Utils/Api.js';
let app = getApp(); let app = getApp();
export default { export default {
data() { data() {
@ -50,6 +54,7 @@
key: "gasKey", key: "gasKey",
data: arr3[0] data: arr3[0]
}) })
that.loginBySilence(arr3[0]);
} }
if (arr2[3] != undefined && arr2[3]) { if (arr2[3] != undefined && arr2[3]) {
let arr4 = arr2[3].split('#'); let arr4 = arr2[3].split('#');
@ -59,12 +64,56 @@
}) })
} }
} }
if (app.globalData.h5code) {
that.getH5AccessToken();
}
// #endif // #endif
}, },
methods: { methods: {
//h5
loginBySilence(item) {
let datas = {
phone: item
}
loginBySilence(datas).then(res => {
if (res.return_code == '000000') {
app.globalData.userInfo = res.return_data
.object
.highUser;
app.globalData.token = res.return_data.uniqueCode;
uni.setStorage({
key: "user",
data: res.return_data
.object
.highUser
})
uni.setStorage({
key: "token",
data: res.return_data.uniqueCode
})
}
})
},
//H5 openId
getH5AccessToken() {
let params = {
code: app.globalData.h5code
}
getH5AccessToken(params).then(res => {
if (res.return_code == '000000' && res.return_data.openid) {
app.globalData.openId = res.return_data.openid;
uni.setStorage({
key: "openId",
data: res.return_data.openid
})
} else {
this.jumpcdx();
}
});
},
jumpcdx() { jumpcdx() {
location.href = location.href =
'https://open.weixin.qq.com/connect/oauth2/authorize?appid=wxa075e8509802f826&redirect_uri=https%3A%2F%2Fhsg.dctpay.com%2FhsgH5%2Findex.html%23%2F&response_type=code&scope=snsapi_base&state=1#wechat_redirect'; 'https://open.weixin.qq.com/connect/oauth2/authorize?appid=wxa075e8509802f826&redirect_uri=https%3A%2F%2Fhsgcs.dctpay.com%2FhsgH5%2Findex.html%23%2F&response_type=code&scope=snsapi_base&state=1#wechat_redirect';
}, },
} }
} }

@ -135,6 +135,7 @@
<view class="width70 fotrt" v-if="orderList.payType == 2">微信</view> <view class="width70 fotrt" v-if="orderList.payType == 2">微信</view>
<view class="width70 fotrt" v-if="orderList.payType == 3">积分</view> <view class="width70 fotrt" v-if="orderList.payType == 3">积分</view>
<view class="width70 fotrt" v-if="orderList.payType == 4">工会卡</view> <view class="width70 fotrt" v-if="orderList.payType == 4">工会卡</view>
<view class="width70 fotrt" v-if="orderList.payType == 5">银联支付</view>
</view> </view>
<view class="width94 alijusstart mart20 font14 fcor666" v-if="orderList.remarks && typeid != 10"> <view class="width94 alijusstart mart20 font14 fcor666" v-if="orderList.remarks && typeid != 10">
<view class="width30">联系方式</view> <view class="width30">联系方式</view>

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.6 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.5 KiB

@ -52,6 +52,9 @@
<view class="right" v-if="recinfo.payType == 3"> <view class="right" v-if="recinfo.payType == 3">
汇联通工会卡 汇联通工会卡
</view> </view>
<view class="right" v-if="recinfo.payType == 4">
银联支付
</view>
</view> </view>
<view class="row" v-if="recinfo.rechargeStatus"> <view class="row" v-if="recinfo.rechargeStatus">

@ -0,0 +1,63 @@
<template>
<view>
<image :src="imagewxUrl+imgadres" class="width100 imgsbg" mode="widthFix"></image>
<image :src="imagewxUrl+imgadres2" class="width90 imgsbtn mart230" mode="widthFix" @click="junpuniony()">
</image>
<image :src="imagewxUrl+imgadres1" class="width90 imgsbtn mart10" mode="widthFix" @click="jumpwx()"></image>
<view class="btn mart50" @click="backHome()">返回首页</view>
</view>
</template>
<script>
let app = getApp();
export default {
data() {
return {
imagewxUrl: app.globalData.imageWxImg,
imgadres: 'selecttrance.png',
imgadres1: 'wxtrance.png',
imgadres2: 'unionytrance.png',
url: 'https://base.95516.com/s/wl/WebAPP/helpAgree/page/help/shareRutineHelp.html?params=eyJlbmNyeXB0QXBwSWQiOiI3MzcxZmM2M2JhNTRjODk1IiwidG9MaW5rIjoiaHR0cHMlM0ElMkYlMkZoc2cuZGN0cGF5LmNvbSUyRnVuaW9uUGF5JTJGIn0='
}
},
methods: {
// ../../goods/goods-list/goods-list?id=3
junpuniony() {
location.href = this.url;
},
jumpwx() {
uni.navigateTo({
url: '../brand-classification/brand-classification?id=12'
})
},
backHome() {
uni.navigateBack({
})
}
}
}
</script>
<style lang="scss">
.imgsbg {
position: absolute;
}
.imgsbtn {
position: relative;
}
.btn {
color: #333;
background-color: #ffffff;
width: 100%;
height: 100rpx;
font-size: 36rpx;
text-align: center;
line-height: 100rpx;
position: fixed;
bottom: 0px;
}
</style>

@ -557,6 +557,9 @@ $uni-font-size-paragraph:30upx;
.margle10{ .margle10{
margin-left: 10px; margin-left: 10px;
} }
.mart230 {
margin-top: 230px;
}
.mart90 { .mart90 {
margin-top: 90px; margin-top: 90px;
} }
@ -828,3 +831,7 @@ $uni-font-size-paragraph:30upx;
.icon12 { .icon12 {
width: 12px; width: 12px;
} }
.icon40 {
width: 40px;
}
Loading…
Cancel
Save