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

1.对接代理商接口

Browse Source
yj-dev
杨杰 4 years ago
parent f1f8726917
commit c135169cdb
11 changed files with 123 additions and 69 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. 4
      pages/goods/HM-search/HM-search.vue
  2. 16
      pages/goods/coupons-info-details/coupons-info-details.vue
  3. 4
      pages/goods/externalCoupon/externalCoupon.vue
  4. 4
      pages/goods/goods-list/goods-list.vue
  5. 4
      pages/goods/goods.vue
  6. 29
      pages/login/login.vue
  7. 4
      pages/tabBar/home/home.vue
  8. 58
      pages/user/agentCoupons/agentCoupons.vue
  9. 4
      pages/user/mineCoupons/mineCoupons.vue
  10. 4
      pages/user/mineCouponsDestails/mineCouponsDestails.vue
  11. 55
      pages/user/minePromotion/minePromotion.vue

4
pages/goods/HM-search/HM-search.vue
Unescape View File

@ -279,10 +279,10 @@
.name { .name {
width: 92%; width: 92%;
padding: 10upx 4%; padding: 8upx 4%;
display: -webkit-box; display: -webkit-box;
-webkit-box-orient: vertical; -webkit-box-orient: vertical;
-webkit-line-clamp: 2; -webkit-line-clamp: 1;
text-align: justify; text-align: justify;
overflow: hidden; overflow: hidden;
font-size: 30upx; font-size: 30upx;

16
pages/goods/coupons-info-details/coupons-info-details.vue
Unescape View File

@ -1,10 +1,10 @@
<template> <template>
<view> <view>
<view class="width100 fotct coupon-status font20 fcorred" v-if="couponDesInfo.highUserCoupon.status == 2">已使用 <view class="width100 fotct coupon-status font20 fcorred" v-if="couponDesInfo.couponAgentCode.status == 2">待使用
</view> </view>
<view class="width100 fotct coupon-status font20 fcor41c" v-if="couponDesInfo.highUserCoupon.status == 1">未使用 <view class="width100 fotct coupon-status font20 fcor41c" v-if="couponDesInfo.couponAgentCode.status == 1">待销售
</view> </view>
<view class="width100 fotct coupon-status font20 fcor41c" v-if="couponDesInfo.highUserCoupon.status == 0">已过期 <view class="width100 fotct coupon-status font20 fcor41c" v-if="couponDesInfo.couponAgentCode.status == 3">已使用
</view> </view>
<view class="line1"></view> <view class="line1"></view>
<view class="coupon-cont width90"> <view class="coupon-cont width90">
@ -24,7 +24,7 @@
<view class="line1 mart15"></view> <view class="line1 mart15"></view>
<view class="width90 mart10 fcor666" v-if="couponDesInfo.highUserCoupon.status != 0">核销码(商户扫客户)</view> <view class="width90 mart10 fcor666" v-if="couponDesInfo.highUserCoupon.status != 0">核销码(商户扫客户)</view>
<view class="width90 mart20 fotct" v-if="couponDesInfo.highUserCoupon.status != 0"> <view class="width90 mart20 fotct" v-if="couponDesInfo.highUserCoupon.status != 0">
<image class="coupon-qr" :src="imageUrl+'couponCode/'+couponDesInfo.highUserCoupon.qrCodeImg"></image> <image class="coupon-qr" :src="imageUrl+'couponCode/'+couponDesInfo.couponCode.ext1"></image>
</view> </view>
<!-- <view class="width90 mart20" style="height: 80px;" v-for="(store,i) in storeList" :key="i"> <!-- <view class="width90 mart20" style="height: 80px;" v-for="(store,i) in storeList" :key="i">
@ -107,10 +107,10 @@
} }
getCodeById(params).then(res => { getCodeById(params).then(res => {
if (res.return_code == '000000') { if (res.return_code == '000000') {
// this.couponDesInfo = res.return_data; this.couponDesInfo = res.return_data;
// this.oneTime = res.return_data.highUserCoupon.createTime; this.oneTime = res.return_data.couponCode.receiveTime;
// this.twoTime = res.return_data.highUserCoupon.useEndTime; this.twoTime = res.return_data.couponCode.useEndTime;
// this.threeTime = res.return_data.highUserCoupon.consumeTime; this.threeTime = res.return_data.couponCode.consumeTime;
uni.hideLoading() uni.hideLoading()
} else { } else {
uni.hideLoading() uni.hideLoading()

4
pages/goods/externalCoupon/externalCoupon.vue
Unescape View File

@ -295,10 +295,10 @@
.name { .name {
width: 92%; width: 92%;
padding: 10upx 4%; padding: 8upx 4%;
display: -webkit-box; display: -webkit-box;
-webkit-box-orient: vertical; -webkit-box-orient: vertical;
-webkit-line-clamp: 2; -webkit-line-clamp: 1;
text-align: justify; text-align: justify;
overflow: hidden; overflow: hidden;
font-size: 30upx; font-size: 30upx;

4
pages/goods/goods-list/goods-list.vue
Unescape View File

@ -216,10 +216,10 @@
} }
.name{ .name{
width: 92%; width: 92%;
padding: 10upx 4%; padding: 8upx 4%;
display: -webkit-box; display: -webkit-box;
-webkit-box-orient: vertical; -webkit-box-orient: vertical;
-webkit-line-clamp: 2; -webkit-line-clamp: 1;
text-align: justify; text-align: justify;
overflow: hidden; overflow: hidden;
font-size: 30upx; font-size: 30upx;

4
pages/goods/goods.vue
Unescape View File

@ -519,10 +519,10 @@
.name { .name {
width: 92%; width: 92%;
padding: 10upx 4%; padding: 8upx 4%;
display: -webkit-box; display: -webkit-box;
-webkit-box-orient: vertical; -webkit-box-orient: vertical;
-webkit-line-clamp: 2; -webkit-line-clamp: 1;
text-align: justify; text-align: justify;
overflow: hidden; overflow: hidden;
font-size: 30upx; font-size: 30upx;

29
pages/login/login.vue
Unescape View File

@ -60,8 +60,9 @@
}, },
onLoad(options) { onLoad(options) {
this.typeId = options.id; let that = this;
if(this.typeId == 1){ that.typeId = options.id;
if(that.typeId == 1){
uni.setNavigationBarTitle({ uni.setNavigationBarTitle({
title:'门店登录' title:'门店登录'
}) })
@ -70,12 +71,24 @@
title:'代理商登录' title:'代理商登录'
}) })
} }
uni.getStorage({
key: 'phoneNum',
success(e) {
that.phoneNumber = e.data;
}
})
uni.getStorage({
key: 'pasNum',
success(e) {
that.passwd = e.data;
}
})
//APP显示第三方登录 //APP显示第三方登录
// #ifdef APP-PLUS // #ifdef APP-PLUS
this.isShowOauth = true; that.isShowOauth = true;
// #endif // #endif
this.getProvider(); that.getProvider();
}, },
methods: { methods: {
@ -175,6 +188,14 @@
} }
userLogin(datas).then(res => { userLogin(datas).then(res => {
if (res.return_code == '000000') { if (res.return_code == '000000') {
uni.setStorage({
key: "phoneNum",
data: this.phoneNumber
})
uni.setStorage({
key: "pasNum",
data: this.passwd
})
uni.hideLoading(); uni.hideLoading();
if(this.typeId == 1){ if(this.typeId == 1){
uni.navigateTo({ uni.navigateTo({

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

@ -744,10 +744,10 @@
.name { .name {
width: 92%; width: 92%;
padding: 10upx 4%; padding: 8upx 4%;
display: -webkit-box; display: -webkit-box;
-webkit-box-orient: vertical; -webkit-box-orient: vertical;
-webkit-line-clamp: 2; -webkit-line-clamp: 1;
text-align: justify; text-align: justify;
overflow: hidden; overflow: hidden;
font-size: 30upx; font-size: 30upx;

58
pages/user/agentCoupons/agentCoupons.vue
Unescape View File

@ -3,19 +3,20 @@
<view class="onorder width90" v-if="agentCouponList.length==0"> <view class="onorder width90" v-if="agentCouponList.length==0">
<image src="../../../static/img/noorder.png"></image> <image src="../../../static/img/noorder.png"></image>
<view class="text"> <view class="text">
暂无数据... 暂无数据
</view> </view>
</view> </view>
<view class="width90 height120 backcorfff mart15" v-for="(agent,index) in agentCouponList" :key="index"> <view class="width90 height120 backcorfff mart15" v-for="(agent,index) in agentCouponList" :key="index">
<image class="flleft agent_img margle mart10" src='../../../static/img/logo.png'></image> <image class="flleft agent_img margle mart10" v-if="agent.merchantLogo == null" src='../../../static/img/logo.png'></image>
<image class="flleft agent_img margle mart10" v-else :src="image_url+agent.merchantLogo"></image>
<view class="agent_title paddtop13"> <view class="agent_title paddtop13">
<view class="font18 fcor333 width100">重庆中石化码商券</view> <view class="font18 fcor333 width100">{{agent.highCoupon.couponName}}</view>
<view class="width100 mart5 font14 fcor333 height22"> <view class="width100 mart5 font14 fcor333 height22">
<view class="agent_left_num flleft"> <view class="agent_left_num flleft text1">
42342424234234 {{agent.highCouponCode.salesCode}}
</view> </view>
<view class="agent_right_num flright fotrt"> <view class="agent_right_num flright fotrt">
300.00 {{agent.highCoupon.salesPrice}}.00
</view> </view>
</view> </view>
</view> </view>
@ -25,7 +26,8 @@
v-if="typeId == 1">生成油码</button> v-if="typeId == 1">生成油码</button>
<button class="flright backcorf06 fcorfff font15 agent_btn mart10" @click="jumpCouponDes(agent.id)" <button class="flright backcorf06 fcorfff font15 agent_btn mart10" @click="jumpCouponDes(agent.id)"
v-if="typeId == 2">查看详情</button> v-if="typeId == 2">查看详情</button>
<view class="agent_ts font15 fcor333 fotrt">出售时间:2021.4.13 23:14</view> <view class="agent_ts font15 fcor333 fotrt" v-if="typeId == 2">
出售时间:{{agent.highCouponCode.receiveTime | formatDate('-')}}</view>
</view> </view>
</view> </view>
</view> </view>
@ -36,6 +38,7 @@
getCodeListByAgentCoupon, getCodeListByAgentCoupon,
generateCode generateCode
} from "../../../Utils/Api.js"; } from "../../../Utils/Api.js";
let app =getApp();
export default { export default {
data() { data() {
return { return {
@ -44,12 +47,32 @@
agentCouponList: [], agentCouponList: [],
isNoMoreData: false, isNoMoreData: false,
typeId: '', typeId: '',
reFreshs: "" reFreshs: '',
couponId: '',
image_url : app.globalData.imgUrl
}
},
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}`;
} }
}, },
onLoad(option) { onLoad(option) {
this.typeId = option.id; this.typeId = option.id;
this.couponId = option.couponsId;
}, },
onShow() { onShow() {
this.getCodeListByAgentCoupon(); this.getCodeListByAgentCoupon();
@ -74,12 +97,23 @@
return false; return false;
} }
let pagenum = this.pageNum; let pagenum = this.pageNum;
let params = { let params;
if (this.typeId == 1) {
params = {
pageNum: pagenum,
couponId: this.couponId,
status: 1,
pageSize: this.pageSize
}
} else if(this.typeId == 2){
params = {
pageNum: pagenum, pageNum: pagenum,
couponId: 23423529, couponId: this.couponId,
status: this.typeId, status: '2,3',
pageSize: this.pageSize pageSize: this.pageSize
} }
}
getCodeListByAgentCoupon(params).then(res => { getCodeListByAgentCoupon(params).then(res => {
uni.hideLoading(); uni.hideLoading();
if (res.return_code == '000000') { if (res.return_code == '000000') {

4
pages/user/mineCoupons/mineCoupons.vue
Unescape View File

@ -195,10 +195,10 @@
.name { .name {
width: 92%; width: 92%;
padding: 10upx 4%; padding: 8upx 4%;
display: -webkit-box; display: -webkit-box;
-webkit-box-orient: vertical; -webkit-box-orient: vertical;
-webkit-line-clamp: 2; -webkit-line-clamp: 1;
text-align: justify; text-align: justify;
overflow: hidden; overflow: hidden;
font-size: 30upx; font-size: 30upx;

4
pages/user/mineCouponsDestails/mineCouponsDestails.vue
Unescape View File

@ -165,10 +165,10 @@
.name { .name {
width: 92%; width: 92%;
padding: 10upx 4%; padding: 8upx 4%;
display: -webkit-box; display: -webkit-box;
-webkit-box-orient: vertical; -webkit-box-orient: vertical;
-webkit-line-clamp: 2; -webkit-line-clamp: 1;
text-align: justify; text-align: justify;
overflow: hidden; overflow: hidden;
font-size: 30upx; font-size: 30upx;

55
pages/user/minePromotion/minePromotion.vue
Unescape View File

@ -10,8 +10,8 @@
<view class="promotion_xg flleft" style="margin-left: -6px;"></view> <view class="promotion_xg flleft" style="margin-left: -6px;"></view>
</view> </view>
<view class="width90 mart5 height22"> <view class="width90 mart5 height22">
<view class="width50 flleft font18 fcor333 fontwig6 fotlt">7</view> <view class="width50 flleft font18 fcor333 fontwig6 fotlt">{{agentList.orderCount}}</view>
<view class="width50 flright font18 fcor333 fontwig6 fotrt">5300.00</view> <view class="width50 flright font18 fcor333 fontwig6 fotrt">{{agentList.turnoverPrice}}</view>
</view> </view>
<view class="width90 mart10"> <view class="width90 mart10">
<view class="width50 flleft font15 fcor666 fontwig6 fotlt">今日订单</view> <view class="width50 flleft font15 fcor666 fontwig6 fotlt">今日订单</view>
@ -33,22 +33,23 @@
</image> </image>
<view class="pro_cont paddtop15"> <view class="pro_cont paddtop15">
<view class="flleft font16 fcor333 fontwig6 pro_title"> <view class="flleft font16 fcor333 fontwig6 pro_title">
剩余库存(24) 剩余库存({{agentList.laveStockCount}})
</view> </view>
<view class="pro_price fotrt fcor333 font15 fontwig6"> <view class="pro_price fotrt fcor333 font15 fontwig6">
总计 9500.00 总计 {{agentList.surplusCountPrice}}
</view> </view>
</view> </view>
<!-- //循环:class="[index==0?'colorfe':'']" --> <!-- //循环:class="[index==0?'colorfe':'']" -->
<view v-for="(mers,index) in minepros" :key="mers.id" class="pro_mok marb10 colore7" @click="jumpAgent(1)"> <view v-if="minepros == ''">暂无数据</view>
<view v-for="(mers,index) in minepros" :key="mers.id" class="pro_mok marb10 colore7" @click="jumpAgent(1,mers.couponId)">
<view class="width100 font14 fcor333 fontwig6 fotct paddtop10"> <view class="width100 font14 fcor333 fontwig6 fotct paddtop10">
面额100 面额{{mers.salesPrice}}
</view> </view>
<view class="width100 font14 fcor999 fotct mart10"> <view class="width100 font14 fcor999 fotct mart10">
13张 {{mers.stockCount}}张
</view> </view>
<view class="width100 font15 fcor333 fontwig6 fotct mart10"> <view class="width100 font15 fcor333 fontwig6 fotct mart10">
1300 {{mers.salesPrice*mers.stockCount}}
</view> </view>
</view> </view>
</view> </view>
@ -67,22 +68,23 @@
</image> </image>
<view class="pro_cont paddtop15"> <view class="pro_cont paddtop15">
<view class="flleft font16 fcor333 fontwig6 pro_title"> <view class="flleft font16 fcor333 fontwig6 pro_title">
已销售(24) 已销售({{agentList.soldCount}})
</view> </view>
<view class="pro_price fotrt fcor333 font15 fontwig6"> <view class="pro_price fotrt fcor333 font15 fontwig6">
总计 1129500.00 总计 {{agentList.salesCountPrice}}
</view> </view>
</view> </view>
<view v-if="minepros == ''">暂无数据</view>
<!-- //循环 --> <!-- //循环 -->
<view v-for="(mers,index) in minepros" :key="mers.id" class="pro_mok marb10 colore9" @click="jumpAgent(2)"> <view v-for="(mers,index) in minepros" :key="mers.id" class="pro_mok marb10 colore9" @click="jumpAgent(2,mers.couponId)">
<view class="width100 font14 fcor333 fontwig6 fotct paddtop10"> <view class="width100 font14 fcor333 fontwig6 fotct paddtop10">
面额100 面额{{mers.salesPrice}}
</view> </view>
<view class="width100 font14 fcor999 fotct mart10"> <view class="width100 font14 fcor999 fotct mart10">
13张 {{mers.salesCount}}张
</view> </view>
<view class="width100 font15 fcor333 fontwig6 fotct mart10"> <view class="width100 font15 fcor333 fontwig6 fotct mart10">
1300 {{mers.salesPrice*mers.salesCount}}
</view> </view>
</view> </view>
</view> </view>
@ -96,26 +98,23 @@
export default { export default {
data() { data() {
return { return {
minepros: [{ minepros: [],
id: 1 agentList :[]
},
{
id: 1
},
{
id: 1
}
]
} }
}, },
onLoad() {
onShow(){
this.getAgentCount(); this.getAgentCount();
}, },
methods: { methods: {
//查询代理商信息 //查询代理商信息
getAgentCount() { getAgentCount() {
getAgentCount().then(res => { getAgentCount().then(res => {
if (res.return_code == '000000') {} else { if (res.return_code == '000000') {
this.agentList = res.return_data;
this.minepros = res.return_data.list
} else {
uni.showToast({ uni.showToast({
title: res.return_msg, title: res.return_msg,
icon: "none" icon: "none"
@ -124,9 +123,9 @@
}) })
}, },
//跳转代理商卡券 //跳转代理商卡券
jumpAgent(item) { jumpAgent(item,items) {
uni.navigateTo({ uni.navigateTo({
url: '../agentCoupons/agentCoupons?id='+item url: '../agentCoupons/agentCoupons?id='+item +'&couponsId='+ items
}) })
} }
} }

Write Preview
Loading…
Cancel
Save