yangjie
/
high-mini
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

1.上传代码

Browse Source
yj-dev
杨杰 2 years ago
parent abd6bb62f6
commit c6f57b6c8a
13 changed files with 191 additions and 176 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 30
      App.vue
  2. 78
      pages/goods/recording/recording.vue
  3. 2
      pages/goods/refuel-confirm/refuel-confirm.vue
  4. 7
      pages/goods/refuel-details/refuel-details.vue
  5. 3
      pages/goods/refuel/refuel.vue
  6. 2
      pages/order/confirmation.vue
  7. 3
      pages/tabBar/category/category.vue
  8. 2
      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

30
App.vue
Unescape View File

@ -5,15 +5,15 @@
// brestUrl: 'http://192.168.3.4:9302/brest', // brestUrl: 'http://192.168.3.4:9302/brest',
// imgUrl: 'https://192.168.3.4:9301/filesystem/', // imgUrl: 'https://192.168.3.4:9301/filesystem/',
//正式 //正式
// url: 'https://hsg.dctpay.com/crest', url: 'https://hsg.dctpay.com/crest',
// imgUrl: 'https://hsg.dctpay.com/filesystem/', imgUrl: 'https://hsg.dctpay.com/filesystem/',
// brestUrl : 'https://hsg.dctpay.com/brest', brestUrl: 'https://hsg.dctpay.com/brest',
// imageWxImg:'https://hsg.dctpay.com/filesystem/wxApplets/', imageWxImg: 'https://hsg.dctpay.com/filesystem/wxApplets/',
//测试 //测试
url: 'https://hsgcs.dctpay.com/crest', // url: 'https://hsgcs.dctpay.com/crest',
brestUrl : 'https://hsgcs.dctpay.com/brest', // brestUrl : 'https://hsgcs.dctpay.com/brest',
imgUrl: 'https://hsgcs.dctpay.com/filesystem/', // imgUrl: 'https://hsgcs.dctpay.com/filesystem/',
imageWxImg:'https://hsgcs.dctpay.com/filesystem/wxApplets/', // imageWxImg:'https://hsgcs.dctpay.com/filesystem/wxApplets/',
userInfo: "", userInfo: "",
brestUserInfo: '', brestUserInfo: '',
bresthighAgent: '', bresthighAgent: '',
@ -49,14 +49,14 @@
//星巴克价格 //星巴克价格
salesTallPrice: '', salesTallPrice: '',
//第三方嵌入id //第三方嵌入id
mchId:'' mchId: '',
}, //千猪名称
onLaunch: function() { qianzhuCityName: ''
},
onShow: function() {
}, },
onHide: function() { onLaunch: function() {},
} onShow: function() {},
onHide: function() {}
} }
</script> </script>

78
pages/goods/recording/recording.vue
Unescape View File

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

2
pages/goods/refuel-confirm/refuel-confirm.vue
Unescape View File

@ -271,7 +271,7 @@
tongCardPrice: 0, tongCardPrice: 0,
oilPirce: 0, //油卡余额 oilPirce: 0, //油卡余额
user: '', user: '',
paytype: '', paytype: 'weixin',
PaymentPassword: '', PaymentPassword: '',
timedeductionPrice: '0', //本次优惠金额 timedeductionPrice: '0', //本次优惠金额

7
pages/goods/refuel-details/refuel-details.vue
Unescape View File

@ -217,6 +217,7 @@
onLoad(options) { onLoad(options) {
this.store_key = options.id; this.store_key = options.id;
this.counId = options.desId; this.counId = options.desId;
this.oilNo = options.oilNo;
if (app.globalData.accountId) { if (app.globalData.accountId) {
this.isTyAgent = true; this.isTyAgent = true;
} }
@ -320,8 +321,8 @@
uni.hideLoading(); uni.hideLoading();
if (res.return_code == '000000') { if (res.return_code == '000000') {
this.storeList = res.return_data; this.storeList = res.return_data;
if (!this.oilNo) { // if (!this.oilNo) {
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;
@ -336,7 +337,7 @@
this.gasOilNo = res.return_data.gasGunList[i].oilNo; this.gasOilNo = res.return_data.gasGunList[i].oilNo;
} }
} }
} // }
} else { } else {
uni.showToast({ uni.showToast({
title: res.return_msg, title: res.return_msg,

3
pages/goods/refuel/refuel.vue
Unescape View File

@ -272,7 +272,8 @@
//跳转详情 //跳转详情
goDetails(items, itemId) { goDetails(items, itemId) {
uni.navigateTo({ 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) { result(val) {

2
pages/order/confirmation.vue
Unescape View File

@ -281,7 +281,9 @@
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){
this.getHuiLianTongCardBalance(); this.getHuiLianTongCardBalance();
}
this.getUserNormalDiscountList(); this.getUserNormalDiscountList();
uni.setStorage({ uni.setStorage({
key: "user", key: "user",

3
pages/tabBar/category/category.vue
Unescape View File

@ -22,7 +22,7 @@
<image mode="widthFix" class="stuimg margle" :src="imagewxUrl+imgadres2"></image> <image mode="widthFix" class="stuimg margle" :src="imagewxUrl+imgadres2"></image>
</view> --> </view> -->
<picker mode="selector" :range="MerchantList" range-key="merchantName" @change="showCategory"> <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> <image mode="widthFix" class="stuimg margle" :src="imagewxUrl+imgadres2"></image>
</view> </view>
</picker> </picker>
@ -303,6 +303,7 @@
position: fixed; position: fixed;
right: 40rpx; right: 40rpx;
} }
.xfimg { .xfimg {
width: 80rpx; width: 80rpx;
bottom: 60rpx; bottom: 60rpx;

2
pages/tabBar/home/home.vue
Unescape View File

@ -236,7 +236,6 @@
onLoad(options) { onLoad(options) {
let that = this; let that = this;
// #ifdef MP // #ifdef MP
app.globalData.accountId = options.accountId;
// 1.wx获取登录用户code // 1.wx获取登录用户code
uni.login({ uni.login({
provider: 'weixin', provider: 'weixin',
@ -466,6 +465,7 @@
that.city = res.return_data.result.addressComponent.province; that.city = res.return_data.result.addressComponent.province;
app.globalData.cityName = res.return_data.result.addressComponent app.globalData.cityName = res.return_data.result.addressComponent
.province; .province;
app.globalData.qianzhuCityName = res.return_data.result.addressComponent.city;
app.globalData.cityId = res.return_data.result.addressComponent.adcode; app.globalData.cityId = res.return_data.result.addressComponent.adcode;
// app.globalData.cityId = '500103'; // app.globalData.cityId = '500103';
if (res.return_data.result.addressComponent.adcode) { if (res.return_data.result.addressComponent.adcode) {

18
pages/tabBar/user/user.vue
Unescape View File

@ -89,9 +89,9 @@
<uni-badge text="1" type="error" /> <uni-badge text="1" type="error" />
</view> --> </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> :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> v-if="row.text == '我的优惠券' && textSend " :text="textSend" type="error" size="normal"></uni-badge>
<view class="img"> <view class="img">
<image :src="imagewxUrl+row.img"></image> <image :src="imagewxUrl+row.img"></image>
@ -215,15 +215,15 @@
], ],
// 工具栏列表 // 工具栏列表
mytoolbarList: [{ mytoolbarList: [{
url: '/pages/goods/recording/recording?id=1', url: '/pages/goods/recording/recording',
text: '充值记录', text: '积分记录',
img: 'user/mingxi.png' img: 'user/mingxi.png'
}, },
{ // {
url: '/pages/goods/recording/recording?id=2', // url: '/pages/goods/recording/recording?id=2',
text: '消费记录', // text: '消费记录',
img: 'user/quan.png' // img: 'user/quan.png'
}, // },
{ {
url: '/pages/user/mineCoupons/mineCoupons', url: '/pages/user/mineCoupons/mineCoupons',
text: '我的卡券', text: '我的卡券',

8
pages/welcome/welcome.vue
Unescape View File

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

4
qianzhu-KFC/buffet-order/buffet-order.vue
Unescape View File

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

6
qianzhu-Starbucks/changeRegin/changeRegin.vue
Unescape View File

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

6
subPages/recharge-centre/recharge-centre.vue
Unescape View File

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

Write Preview
Loading…
Cancel
Save