1.上传代码

yj-dev
杨杰 2 years ago
parent abd6bb62f6
commit c6f57b6c8a
  1. 98
      App.vue
  2. 94
      pages/goods/recording/recording.vue
  3. 2
      pages/goods/refuel-confirm/refuel-confirm.vue
  4. 9
      pages/goods/refuel-details/refuel-details.vue
  5. 3
      pages/goods/refuel/refuel.vue
  6. 6
      pages/order/confirmation.vue
  7. 109
      pages/tabBar/category/category.vue
  8. 4
      pages/tabBar/home/home.vue
  9. 18
      pages/tabBar/user/user.vue
  10. 8
      pages/welcome/welcome.vue
  11. 4
      qianzhu-KFC/buffet-order/buffet-order.vue
  12. 6
      qianzhu-Starbucks/changeRegin/changeRegin.vue
  13. 6
      subPages/recharge-centre/recharge-centre.vue

@ -1,62 +1,62 @@
<script>
export default {
globalData: {
// url: 'http://192.168.3.4:9301/crest',
// url: 'http://192.168.3.4:9301/crest',
// brestUrl: 'http://192.168.3.4:9302/brest',
// imgUrl: 'https://192.168.3.4:9301/filesystem/',
//
// url: 'https://hsg.dctpay.com/crest',
// imgUrl: 'https://hsg.dctpay.com/filesystem/',
// brestUrl : 'https://hsg.dctpay.com/brest',
// imageWxImg:'https://hsg.dctpay.com/filesystem/wxApplets/',
//
url: 'https://hsgcs.dctpay.com/crest',
brestUrl : 'https://hsgcs.dctpay.com/brest',
imgUrl: 'https://hsgcs.dctpay.com/filesystem/',
imageWxImg:'https://hsgcs.dctpay.com/filesystem/wxApplets/',
userInfo: "",
brestUserInfo : '',
bresthighAgent:'',
url: 'https://hsg.dctpay.com/crest',
imgUrl: 'https://hsg.dctpay.com/filesystem/',
brestUrl: 'https://hsg.dctpay.com/brest',
imageWxImg: 'https://hsg.dctpay.com/filesystem/wxApplets/',
//
// url: 'https://hsgcs.dctpay.com/crest',
// brestUrl : 'https://hsgcs.dctpay.com/brest',
// imgUrl: 'https://hsgcs.dctpay.com/filesystem/',
// imageWxImg:'https://hsgcs.dctpay.com/filesystem/wxApplets/',
userInfo: "",
brestUserInfo: '',
bresthighAgent: '',
openId: '',
code: '',
token: '',
brestToken:'',
token: '',
brestToken: '',
cityId: '',
cityName:'',
longitude : '',
latitude : '',
balancePrice : '',
balanceCardNo:'',
identificationCode:'',
// h5
h5code:'',
//ID
storeid:'',
//
storename:'',
//
accountId:'',
//key
gasKey:'',
//code
staffCode:'',
//
accountType:'',
//
distinguishid:'',
//
qianzhulist:'',
//
salesTallPrice:'',
//id
mchId:''
cityName: '',
longitude: '',
latitude: '',
balancePrice: '',
balanceCardNo: '',
identificationCode: '',
// h5
h5code: '',
//ID
storeid: '',
//
storename: '',
//
accountId: '',
//key
gasKey: '',
//code
staffCode: '',
//
accountType: '',
//
distinguishid: '',
//
qianzhulist: '',
//
salesTallPrice: '',
//id
mchId: '',
//
qianzhuCityName: ''
},
onLaunch: function() {
},
onShow: function() {
},
onHide: function() {
}
onLaunch: function() {},
onShow: function() {},
onHide: function() {}
}
</script>

@ -5,24 +5,43 @@
<image mode="widthFix" style="width: 70vw;" :src="imagewxUrl+imgadres"></image>
</view>
<view class="width90" v-for="recod in recordInfo" :key="recod.id">
<view class="width100 font15 height20 mart10">
<view class="flleft width50 fcor666">
积分充值
</view>
<view class="flright width50 fotrt fcorred" v-if="typeId == 1">
+{{recod.gold}}
<view class="width94 backcorfff mart20" style="border-radius: 8px;">
<view class="width94 alijus fotct font15 fcor333 paddtop20" v-if="recordInfo != ''" >
<view class="width50" @click="changestu(1)">积分收支明细</view>
<view class="width50" @click="changestu(2)">7天即将过期积分</view>
</view>
<view class="width94 paddtop15" v-if="recordInfo != ''" >
<view class="width50 flleft fotct" v-if="typeId == 1">
<view class="width40w" style="height: 2px;background-color: red;"></view>
</view>
<view class="flright width50 fotrt fcorred" v-else>
-{{recod.gold}}
<view class="width50 flright fotct" v-if="typeId == 2">
<view class="width40w" style="height: 2px;background-color: red;"></view>
</view>
</view>
<view class="width100 fcor999 font14 mart5">
{{recod.createTime | formatDate('-')}}
<view class="width100 line1 marb20" v-if="recordInfo != ''"></view>
<view class="width100" v-for="recod in recordInfo" :key="recod.id">
<view class="width94 font15 mart10 alijusstart">
<view class="width70">
<view class="fcor666">
积分充值
</view>
<view class="fcor999 font14 mart10">
{{recod.createTime | formatDate('-')}}
</view>
</view>
<view class="width30">
<view class="font20 fotrt fcorred" v-if="typeId == 1">
+{{recod.gold}}
</view>
<view class=" font20 fotrt fcor41c" v-else>
-{{recod.gold}}
</view>
</view>
</view>
<view class="line1f2 mart10"></view>
</view>
<view class="line1f2 mart15"></view>
</view>
<view class="loading-text">{{ loadingText }}</view>
<view class="height60"></view>
</view>
</template>
@ -34,27 +53,26 @@
export default {
data() {
return {
typeId: '',
typeId: 1,
recordInfo: [],
imagewxUrl: app.globalData.imageWxImg,
imgadres:'noorder.png',
imgadres: 'noorder.png',
pageNum: 1,
pageSize: 10,
isNoMoreData: false,
loadingText: ''
}
},
onLoad(option) {
this.typeId = option.id;
if (this.typeId == 1) {
uni.setNavigationBarTitle({
title: '充值记录'
})
} else {
uni.setNavigationBarTitle({
title: '消费记录'
})
}
// this.typeId = option.id;
// if (this.typeId == 1) {
uni.setNavigationBarTitle({
title: '积分记录'
})
// } else {
// uni.setNavigationBarTitle({
// title: ''
// })
// }
this.getUserGoldRecLists();
},
filters: {
@ -79,13 +97,16 @@
this.getUserGoldRecLists();
},
methods: {
//
changestu(item) {
this.typeId = item;
},
getUserGoldRecLists() {
uni.showLoading({
title: '加载中...'
})
if (this.isNoMoreData) {
uni.hideLoading()
this.loadingText = '到底了';
return false;
}
let pagenum = this.pageNum;
@ -98,7 +119,7 @@
if (res.return_code == '000000') {
uni.hideLoading();
this.isNoMoreData = res.return_data.list.length == this.pageSize ? false : true;
if(res.return_data.total == (this.pageNum * this.pageSize)){
if (res.return_data.total == (this.pageNum * this.pageSize)) {
this.isNoMoreData = true;
}
this.pageNum = res.return_data.list.length == this.pageSize ? ++pagenum : pagenum;
@ -115,28 +136,13 @@
<style lang="scss">
page {
background-color: #f8f8f9;
}
.loading-text {
width: 100%;
display: flex;
justify-content: center;
align-items: center;
height: 60upx;
color: #979797;
font-size: 24upx;
background-color: #f6f6f6;
}
.bordr {
border-top: 1px solid #fcfcfc;
}
.height60 {
height: 60px;
line-height: 60px;
}
.pictime {
margin-left: 20px;
}

@ -271,7 +271,7 @@
tongCardPrice: 0,
oilPirce: 0, //
user: '',
paytype: '',
paytype: 'weixin',
PaymentPassword: '',
timedeductionPrice: '0', //

@ -216,7 +216,8 @@
},
onLoad(options) {
this.store_key = options.id;
this.counId = options.desId;
this.counId = options.desId;
this.oilNo = options.oilNo;
if (app.globalData.accountId) {
this.isTyAgent = true;
}
@ -320,8 +321,8 @@
uni.hideLoading();
if (res.return_code == '000000') {
this.storeList = res.return_data;
if (!this.oilNo) {
this.oilNo = res.return_data.oilPriceList[0].oilNoName;
// if (!this.oilNo) {
// this.oilNo = res.return_data.oilPriceList[0].oilNoName;
this.priceVip = res.return_data.oilPriceList[0].priceVip;
this.priceGun = res.return_data.oilPriceList[0].priceGun;
this.priceOfficial = res.return_data.oilPriceList[0].priceOfficial;
@ -336,7 +337,7 @@
this.gasOilNo = res.return_data.gasGunList[i].oilNo;
}
}
}
// }
} else {
uni.showToast({
title: res.return_msg,

@ -272,7 +272,8 @@
//
goDetails(items, itemId) {
uni.navigateTo({
url: '../refuel-details/refuel-details?id=' + items + '&desId=' + itemId
url: '../refuel-details/refuel-details?id=' + items + '&desId=' + itemId + '&oilNo=' + this
.onilName
})
},
result(val) {

@ -280,8 +280,10 @@
findUser(params).then(res => {
if (res.return_code == '000000') {
app.globalData.userInfo = res.return_data;
this.user = res.return_data;
this.getHuiLianTongCardBalance();
this.user = res.return_data;
if(this.user.hltCardNo){
this.getHuiLianTongCardBalance();
}
this.getUserNormalDiscountList();
uni.setStorage({
key: "user",

@ -22,7 +22,7 @@
<image mode="widthFix" class="stuimg margle" :src="imagewxUrl+imgadres2"></image>
</view> -->
<picker mode="selector" :range="MerchantList" range-key="merchantName" @change="showCategory">
<view>{{showCategoryIndex}}
<view class="font14">{{showCategoryIndex}}
<image mode="widthFix" class="stuimg margle" :src="imagewxUrl+imgadres2"></image>
</view>
</picker>
@ -60,12 +60,12 @@
{{item.merchantName}}
</view>
</view>
</wybPopup> -->
</wybPopup> -->
<!-- #ifdef MP-->
<image :src="imagewxUrl+imgadres5" mode="widthFix" class="xfimg"></image>
<!-- #endif -->
<!-- #ifdef H5-->
<image :src="imagewxUrl+imgadres5" mode="widthFix" class="h5xfimg" @click="playPhone"></image>
<!-- #endif -->
<!-- #ifdef H5-->
<image :src="imagewxUrl+imgadres5" mode="widthFix" class="h5xfimg" @click="playPhone"></image>
<!-- #endif -->
</view>
</template>
@ -73,7 +73,7 @@
import {
getCouponList,
getStoreListByMerchant,
getMerchantList,
getMerchantList,
findByLatAndLng
} from "../../../Utils/Api.js";
import wybPopup from '../../../components/wyb-popup/wyb-popup.vue';
@ -159,23 +159,23 @@
})
},
//
findByLatAndLng(item, item1) {
let datas = {
lng: item,
lat: item1
}
findByLatAndLng(datas).then(res => {
if (res.return_code == '000000') {
this.city = res.return_data.result.addressComponent.province;
app.globalData.cityName = res.return_data.result.addressComponent
.province;
app.globalData.cityId = res.return_data.result.addressComponent.adcode;
// app.globalData.cityId = '500100';
if (res.return_data.result.addressComponent.adcode) {
this.getMerchantList();
}
}
});
findByLatAndLng(item, item1) {
let datas = {
lng: item,
lat: item1
}
findByLatAndLng(datas).then(res => {
if (res.return_code == '000000') {
this.city = res.return_data.result.addressComponent.province;
app.globalData.cityName = res.return_data.result.addressComponent
.province;
app.globalData.cityId = res.return_data.result.addressComponent.adcode;
// app.globalData.cityId = '500100';
if (res.return_data.result.addressComponent.adcode) {
this.getMerchantList();
}
}
});
},
//
getMerchantList() {
@ -186,10 +186,10 @@
if (res.return_code == '000000' && res.return_data != '') {
this.MerchantList = res.return_data;
this.showCategoryIndex = res.return_data[0].merchantName;
this.showCategoryIndexId = res.return_data[0].id;
this.pageNum = 1;
this.pageSize = 10;
this.isNoMoreData = false;
this.showCategoryIndexId = res.return_data[0].id;
this.pageNum = 1;
this.pageSize = 10;
this.isNoMoreData = false;
this.categoryList = [];
this.getStoreListByMerchant();
@ -267,27 +267,27 @@
url: '../../goods/HM-search/HM-search'
})
// uni.showToast({title: ""});
},
//
playPhone() {
uni.showModal({
title: '客服',
content: '4006780738',
success: function(res) {
if (res.confirm) {
uni.makePhoneCall({
phoneNumber: '4006780738', //
success: function(e) {
console.log(e);
},
fail: function(e) {
console.log(e);
}
})
}
}
})
},
//
playPhone() {
uni.showModal({
title: '客服',
content: '4006780738',
success: function(res) {
if (res.confirm) {
uni.makePhoneCall({
phoneNumber: '4006780738', //
success: function(e) {
console.log(e);
},
fail: function(e) {
console.log(e);
}
})
}
}
})
}
}
}
@ -296,13 +296,14 @@
page {
background-color: #f1f3f5;
}
.h5xfimg {
width: 80rpx;
bottom: 140rpx;
position: fixed;
right: 40rpx;
.h5xfimg {
width: 80rpx;
bottom: 140rpx;
position: fixed;
right: 40rpx;
}
.xfimg {
width: 80rpx;
bottom: 60rpx;

@ -236,7 +236,6 @@
onLoad(options) {
let that = this;
// #ifdef MP
app.globalData.accountId = options.accountId;
// 1.wxcode
uni.login({
provider: 'weixin',
@ -461,11 +460,12 @@
lng: item,
lat: item1
}
findByLatAndLng(datas).then(res => {
findByLatAndLng(datas).then(res => {
if (res.return_code == '000000') {
that.city = res.return_data.result.addressComponent.province;
app.globalData.cityName = res.return_data.result.addressComponent
.province;
app.globalData.qianzhuCityName = res.return_data.result.addressComponent.city;
app.globalData.cityId = res.return_data.result.addressComponent.adcode;
// app.globalData.cityId = '500103';
if (res.return_data.result.addressComponent.adcode) {

@ -89,9 +89,9 @@
<uni-badge text="1" type="error" />
</view> -->
<uni-badge style="width: 20px;position: absolute; right: 30%;" v-if="row.text == '我的卡券' && textnum "
<uni-badge style="width: 20px;position: absolute; right: 55%;" v-if="row.text == '我的卡券' && textnum "
:text="textnum" type="error" size="normal"></uni-badge>
<uni-badge style="width: 20px;position: absolute; right: 7%;"
<uni-badge style="width: 20px;position: absolute; right: 30%;"
v-if="row.text == '我的优惠券' && textSend " :text="textSend" type="error" size="normal"></uni-badge>
<view class="img">
<image :src="imagewxUrl+row.img"></image>
@ -215,15 +215,15 @@
],
//
mytoolbarList: [{
url: '/pages/goods/recording/recording?id=1',
text: '充值记录',
url: '/pages/goods/recording/recording',
text: '积分记录',
img: 'user/mingxi.png'
},
{
url: '/pages/goods/recording/recording?id=2',
text: '消费记录',
img: 'user/quan.png'
},
// {
// url: '/pages/goods/recording/recording?id=2',
// text: '',
// img: 'user/quan.png'
// },
{
url: '/pages/user/mineCoupons/mineCoupons',
text: '我的卡券',

@ -12,8 +12,14 @@
}
},
onLoad() {
onLoad(options) {
let that = this;
// #ifdef MP
app.globalData.accountId = options.accountId;
uni.switchTab({
url: '../tabBar/home/home'
})
// #endif
// #ifdef H5
var arr1 = window.location.href;
var arr2 = arr1.split('=');

@ -84,7 +84,7 @@
},
onShow() {
this.cityName = app.globalData.cityName;
this.cityName = app.globalData.qianzhuCityName;
if (this.typeid == 2) {
this.getStarbucksStore();
}
@ -140,7 +140,7 @@
title: '加载中...'
})
let datas = {
cityName: app.globalData.cityName,
cityName: app.globalData.qianzhuCityName,
storeName: this.storeName,
lat: app.globalData.latitude,
lon: app.globalData.longitude

@ -39,8 +39,7 @@
this.getAllCity();
this.activeCity = {
id: 1,
cityName: app.globalData.cityName,
cityCode: app.globalData.cityId
cityName: app.globalData.qianzhuCityName
}
//
this.hotCity = [{
@ -58,8 +57,7 @@
methods: {
//
cityClick(item) {
app.globalData.cityName = item.cityName;
app.globalData.cityId = item.provinceCode;
app.globalData.qianzhuCityName = item.cityName;
uni.navigateBack({
})
},

@ -28,10 +28,10 @@
<view class="mart5 width90 font18 fcor333 fontwig6">
充值说明
</view>
<view class="width90 mart20" v-if="current == 0">
<!-- <view class="width90 mart20" v-if="current == 0">
<image class="width100" mode="widthFix" :src="imagewxUrl+image2"></image>
</view>
<view class="width90 mart20" v-if="current == 1">
</view> -->
<view class="width90 mart20">
<image class="width100" mode="widthFix" :src="imagewxUrl+image1"></image>
</view>
<view class="height100p"></view>

Loading…
Cancel
Save