TmOct5/BlockChainH5
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

merge

Browse Source
This commit is contained in:
唐明明
2021-10-29 11:46:08 +08:00
parent ac75d21177 efdd8e61cb
commit 7ec26ffa3a
45 changed files with 48083 additions and 8179 deletions
Download Patch File Download Diff File Expand all files Collapse all files

69
App.vue
View File

@@ -1,36 +1,43 @@
<script> <script>
export default { export default {
onLaunch() { onLaunch() {
// if (typeof WeixinJSBridge == 'object' && typeof WeixinJSBridge.invoke == 'function') { //#ifdef H5
// handleFontSize() if (typeof WeixinJSBridge == 'object' && typeof WeixinJSBridge.invoke == 'function') {
// } else { handleFontSize()
// document.addEventListener('WeixinJSBridgeReady', handleFontSize, false); } else {
// } document.addEventListener('WeixinJSBridgeReady', handleFontSize, false);
// function handleFontSize() { }
// // 设置网页字体为默认大小 function handleFontSize() {
// WeixinJSBridge.invoke('setFontSizeCallback', { fontSize: 0 }) // 设置网页字体为默认大小
// // 重写设置网页字体大小的事件 WeixinJSBridge.invoke('setFontSizeCallback', {
// WeixinJSBridge.on('menu:setfont', function() { fontSize: 0
// WeixinJSBridge.invoke('setFontSizeCallback', { fontSize: 0 }) })
// }) // 重写设置网页字体大小的事件
// } WeixinJSBridge.on('menu:setfont', function() {
}, WeixinJSBridge.invoke('setFontSizeCallback', {
onShow() { fontSize: 0
console.log('App Show'); })
}, })
onHide() { }
console.log('App Hide'); //#endif
}, },
globalData: { onShow() {
mainColor: 'white' console.log('App Show');
} },
}; onHide() {
console.log('App Hide');
},
globalData: {
mainColor: 'white'
}
};
</script> </script>
<style lang="scss"> <style lang="scss">
@import 'uview-ui/index.scss'; @import 'uview-ui/index.scss';
page {
background: #f5f5f5; page {
-webkit-text-size-adjust: 100% !important; background: #f5f5f5;
} -webkit-text-size-adjust: 100% !important;
}
</style> </style>

47
apis/interfaces/vip.js
View File

@@ -1,4 +1,3 @@
/** /**
* Web唐明明 * Web唐明明
* 匆匆数载恍如梦，岁月迢迢华发增。 * 匆匆数载恍如梦，岁月迢迢华发增。
@@ -6,7 +5,9 @@
* moduleName: 会员 * moduleName: 会员
*/ */
import { request } from '../index' import {
request
} from '../index'
// 会员身份信息 // 会员身份信息
const identities = () => { const identities = () => {
@@ -16,11 +17,11 @@ const identities = () => {
} }
// 提交开通订单 // 提交开通订单
const vipOrder = (id, data) =>{ const vipOrder = (id, data) => {
return request({ return request({
url : 'user/identities/create/' + id, url: 'user/identities/create/' + id,
method : 'POST', method: 'POST',
data : data data: data
}) })
} }
@@ -33,44 +34,44 @@ const vipWechatPay = (order_id, data) => {
} }
// 开通身份内容 // 开通身份内容
const vipCont = (id, data) =>{ const vipCont = (id, data) => {
return request({ return request({
url : 'user/identities/create/' + id, url: 'user/identities/create/' + id,
data : data data: data
}) })
} }
// 上传打款凭证 // 上传打款凭证
const vipVoucher = (data) =>{ const vipVoucher = (data) => {
return request({ return request({
url : 'user/voucher/store', url: 'user/voucher/store',
method : 'POST', method: 'POST',
data : data data: data
}) })
} }
// 编辑凭证 // 编辑凭证
const vipVoucherUpdate = (id,data) =>{ const vipVoucherUpdate = (id, data) => {
return request({ return request({
url : 'user/voucher/'+id+'/update', url: 'user/voucher/' + id + '/update',
method : 'POST', method: 'POST',
data : data data: data
}) })
} }
// 用户协议 // 用户协议
const userAgree = (apiUrl) => { const userAgree = (apiUrl) => {
return request({ return request({
url: apiUrl url: apiUrl
}) })
} }
export { export {
identities, identities,
vipOrder, vipOrder,
vipWechatPay, vipWechatPay,
vipCont, vipCont,
vipVoucher, vipVoucher,
userAgree, userAgree,
vipVoucherUpdate vipVoucherUpdate
} }

2
apis/interfaces/withdraws.js
View File

@@ -82,7 +82,7 @@ const withdrawsIndexLists = (data) => {
}) })
} }
// 积分记录 // 贡献值记录
const userAccoutScores = (data) => { const userAccoutScores = (data) => {
return request({ return request({
url: 'user/account/scores', url: 'user/account/scores',

121
components/goods-list/goods-list.vue
View File

@@ -1,4 +1,3 @@
<template> <template>
<view class="goods--list"> <view class="goods--list">
<block v-if="list.length > 0"> <block v-if="list.length > 0">
@@ -6,8 +5,18 @@
<view class="cover"> <view class="cover">
<image class="cover--src" :src="item.cover" mode="aspectFill" /> <image class="cover--src" :src="item.cover" mode="aspectFill" />
</view> </view>
<template v-if='notag === ""'>
<span class='is_self'
v-if='item.specal_tags.is_self'>{{item.specal_tags.is_self}}</span>
</template>
<view class="content"> <view class="content">
<view class="title">{{item.name}}</view> <view class="title">
<template v-if='notag === ""'>
<span class='is_allow_values'
v-if='item.specal_tags.is_allow_values'>{{item.specal_tags.is_allow_values}}</span>
</template>
{{item.name}}
</view>
<view class="content-flex"> <view class="content-flex">
<view class="price eb" v-if="priceType === 'EB'"> <view class="price eb" v-if="priceType === 'EB'">
{{item.price}}<text>易币</text> {{item.price}}<text>易币</text>
@@ -34,52 +43,73 @@
</template> </template>
<script> <script>
export default { export default {
name : 'goodsList', name: 'goodsList',
props : { props: {
// 数据列表 notag: {
list: { type: String,
type : Array, default: ''
default : () => { },
return new Array // 数据列表
list: {
type: Array,
default: () => {
return new Array
}
},
// 价格类型
priceType: {
type: String,
default: 'EB'
},
// 列表空提示
toast: {
type: String,
default: '暂无商品数据 -_-!'
} }
}, },
// 价格类型 methods: {
priceType: { goods(e) {
type : String, this.$emit('on-goods', e)
default : 'EB' }
},
// 列表空提示
toast : {
type : String,
default : '暂无商品数据 -_-!'
} }
}, };
methods:{
goods(e){
this.$emit('on-goods', e)
}
}
};
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
.goods--list{ .goods--list {
padding: calc(#{$padding} - 10rpx); padding: calc(#{$padding} - 10rpx);
display: flex; display: flex;
flex-wrap: wrap; flex-wrap: wrap;
.goods--item{
.goods--item {
background: white; background: white;
box-sizing: border-box; box-sizing: border-box;
width: calc(50% - 20rpx); width: calc(50% - 20rpx);
margin: 10rpx; margin: 10rpx;
border-radius: $radius/2; border-radius: $radius/2;
overflow: hidden; overflow: hidden;
.cover{ position: relative;
.is_self {
position: absolute;
top: 0;
right: 20rpx;
background-image: linear-gradient(to bottom, #ee4c47, #9e312f);
// background-color: #ee4c47;
box-shadow: 0 4rpx 10rpx 2rpx rgba($color: #000, $alpha: .3);
color: #fff;
font-size: 26;
padding: 2rpx 20rpx 10rpx 20rpx;
border-radius: 0 0 50rpx 50rpx;
}
.cover {
position: relative; position: relative;
width: 100%; width: 100%;
padding-top: 100%; padding-top: 100%;
.cover--src{
.cover--src {
position: absolute; position: absolute;
height: 100%; height: 100%;
width: 100%; width: 100%;
@@ -87,34 +117,50 @@ export default {
left: 0; left: 0;
} }
} }
.content{
.content {
padding: $padding/2; padding: $padding/2;
.title{
.title {
font-size: $title-size-lg; font-size: $title-size-lg;
line-height: 40rpx; line-height: 40rpx;
height: 80rpx; height: 80rpx;
text-align: justify; text-align: justify;
@extend .ellipsis; @extend .ellipsis;
.is_allow_values {
color: #fff;
background-image: linear-gradient(to left, $main-color, $mian-color-light);
padding: 2rpx 14rpx;
font-size: 20rpx;
text-align: center;
border-radius: 30rpx;
margin-right: 20rpx;
}
} }
.content-flex{
.content-flex {
width: 100%; width: 100%;
display: flex; display: flex;
justify-content: space-between; justify-content: space-between;
padding-top: $padding/2; padding-top: $padding/2;
.price{
.price {
width: 50%; width: 50%;
color: $text-price; color: $text-price;
font-weight: bold; font-weight: bold;
font-size: $title-size; font-size: $title-size;
@extend .nowrap; @extend .nowrap;
text{
text {
font-size: $title-size-sm; font-size: $title-size-sm;
font-weight: normal; font-weight: normal;
padding-left: $padding/4; padding-left: $padding/4;
line-height: 50rpx; line-height: 50rpx;
} }
} }
.sales{
.sales {
width: 50%; width: 50%;
font-size: $title-size-sm; font-size: $title-size-sm;
color: $text-gray; color: $text-gray;
@@ -126,8 +172,9 @@ export default {
} }
} }
} }
// 数据空 // 数据空
.goods--null{ .goods--null {
width: 100%; width: 100%;
padding: 200rpx 0; padding: 200rpx 0;
text-align: center; text-align: center;

2
pages.json
View File

@@ -547,7 +547,7 @@
"path": "pages/wallet/fragment", "path": "pages/wallet/fragment",
"name": "Fragment", "name": "Fragment",
"style": { "style": {
"navigationBarTitleText": "积分记录", "navigationBarTitleText": "贡献值记录",
"enablePullDownRefresh": false, "enablePullDownRefresh": false,
"navigationBarBackgroundColor": "#774ffd", "navigationBarBackgroundColor": "#774ffd",
"navigationBarTextStyle": "white" "navigationBarTextStyle": "white"

1
pages/company/approve.vue
View File

@@ -144,7 +144,6 @@
}) })
}) })
} else { } else {
console.log('11', res)
this.getAppliesCategory(res.industries[0].industry_id) this.getAppliesCategory(res.industries[0].industry_id)
} }
}).catch(err => { }).catch(err => {

1
pages/coupons/add.vue
View File

@@ -225,7 +225,6 @@
days : this.timeNumber, days : this.timeNumber,
goodsable_ids : this.coupongoods goodsable_ids : this.coupongoods
} }
console.log(valuss.time_type)
pushCoupons(valuss).then(res => { pushCoupons(valuss).then(res => {
uni.showModal({ uni.showModal({
title : '提示', title : '提示',

1
pages/coupons/management.vue
View File

@@ -86,7 +86,6 @@
type : this.listType, type : this.listType,
status : this.tabsType status : this.tabsType
}).then(res => { }).then(res => {
console.log(res)
this.coupons = res.lists.data this.coupons = res.lists.data
this.pages = res.lists.page this.pages = res.lists.page
}).catch(err => { }).catch(err => {

68
pages/equity/index.vue
View File

@@ -100,7 +100,7 @@
<swiper class="banner-swiper" indicator-color="#e93340" indicator-active-color="#f8f8f8" <swiper class="banner-swiper" indicator-color="#e93340" indicator-active-color="#f8f8f8"
indicator-dots autoplay> indicator-dots autoplay>
<swiper-item v-for="(item, index) in banners" :key="index"> <swiper-item v-for="(item, index) in banners" :key="index">
<image class="cover" :src="item.cover" mode="aspectFill"></image> <image class="cover" :src="item.cover" mode="aspectFill" @click="swiperClick(item.url)" />
</swiper-item> </swiper-item>
</swiper> </swiper>
</view> </view>
@@ -126,8 +126,12 @@
<view class="goods-push" v-if="JSON.stringify(position) != '{}'"> <view class="goods-push" v-if="JSON.stringify(position) != '{}'">
<view class="itme item-mian" @click="onGoods(position.one)"> <view class="itme item-mian" @click="onGoods(position.one)">
<image class="cover" :src="position.one.cover" mode="aspectFill"></image> <image class="cover" :src="position.one.cover" mode="aspectFill"></image>
<view class="title">{{position.one.name}}</view> <view class="title">
<span class='is_allow_values' v-if='position.one.specal_tags.is_allow_values'>{{position.one.specal_tags.is_allow_values}}</span>
{{position.one.name}}
</view>
<view class="price"><text>¥</text>{{position.one.original_price}}</view> <view class="price"><text>¥</text>{{position.one.original_price}}</view>
<span class='is_self' v-if='position.one.specal_tags.is_self'>{{position.one.specal_tags.is_self}}</span>
</view> </view>
<view class="itme"> <view class="itme">
<view class="itme-list" v-for="(item, index) in position.two" :key="index" @click="onGoods(item)"> <view class="itme-list" v-for="(item, index) in position.two" :key="index" @click="onGoods(item)">
@@ -196,6 +200,9 @@
import goodsList from '@/components/goods-list/goods-list' import goodsList from '@/components/goods-list/goods-list'
import industryList from '@/components/industry-list/industry-list' import industryList from '@/components/industry-list/industry-list'
import userAuth from '@/public/userAuth' import userAuth from '@/public/userAuth'
import {
config
} from '@/apis/index.js'
export default { export default {
comments: { comments: {
goodsList, goodsList,
@@ -236,7 +243,8 @@
busList: [], busList: [],
busPage: 1, busPage: 1,
// 分页 // 分页
pageStatus: '' pageStatus: '',
imgUrl: config.apiUrls
}; };
}, },
created() { created() {
@@ -269,6 +277,14 @@
break break
} }
}, },
// 点击轮播图
swiperClick(url) {
if (url === 'goBaoDanList') {
uni.navigateTo({
url: 'pages/goods/lists?type=baodan'
})
}
},
// 领取，更多优惠券 // 领取，更多优惠券
onCoupons(type, id, index) { onCoupons(type, id, index) {
let token = this.$store.getters.getToken let token = this.$store.getters.getToken
@@ -341,6 +357,10 @@
mall().then(res => { mall().then(res => {
this.classify = res.categories.slice(0, 9) this.classify = res.categories.slice(0, 9)
this.banners = res.banners this.banners = res.banners
this.banners = [...this.banners, {
cover: config.apiUrls + 'images/baodan-banner.png',
url: 'goBaoDanList'
}]
this.coupons = res.coupons this.coupons = res.coupons
this.position = res.positions this.position = res.positions
}).catch(err => { }).catch(err => {
@@ -375,7 +395,6 @@
}, },
// 易货分类 // 易货分类
onClassify(id) { onClassify(id) {
console.log(id)
// this.$Router.push({ // this.$Router.push({
// name: 'goodsList' // name: 'goodsList'
// }) // })
@@ -470,6 +489,8 @@
margin: $margin/2; margin: $margin/2;
width: calc(20% - #{$margin}); width: calc(20% - #{$margin});
text-align: center; text-align: center;
position: relative;
.cover { .cover {
width: 98rpx; width: 98rpx;
@@ -482,6 +503,15 @@
line-height: 40rpx; line-height: 40rpx;
font-size: $title-size-sm; font-size: $title-size-sm;
color: $text-gray; color: $text-gray;
.is_allow_values {
color: #fff;
background-image: linear-gradient(to left,$main-color,$mian-color-light);
padding: 2rpx 14rpx;
font-size: 20rpx;
text-align: center;
border-radius: 30rpx;
margin-right: 20rpx;
}
} }
} }
} }
@@ -506,12 +536,34 @@
text-align: center; text-align: center;
border-right: solid 1rpx $border-color; border-right: solid 1rpx $border-color;
@extend .vertical; @extend .vertical;
position: relative;
.is_self {
position: absolute;
top: 14rpx;
right: 20rpx;
background-image: linear-gradient(to bottom, #ee4c47, #9e312f);
// background-color: #ee4c47;
box-shadow: 0 4rpx 10rpx 2rpx rgba($color: #000, $alpha: .3);
color: #fff;
font-size: 26;
padding: 2rpx 20rpx 10rpx 20rpx;
border-radius: 0 0 50rpx 50rpx;
}
.title { .title {
font-weight: bold; font-weight: bold;
font-size: $title-size; font-size: $title-size;
@extend .nowrap; @extend .nowrap;
line-height: 50rpx; line-height: 50rpx;
.is_allow_values {
color: #fff;
background-image: linear-gradient(to left,$main-color,$mian-color-light);
padding: 2rpx 14rpx;
font-size: 20rpx;
text-align: center;
border-radius: 30rpx;
margin-right: 20rpx;
}
} }
.price { .price {
@@ -527,9 +579,9 @@
} }
.cover { .cover {
margin-bottom: 30rpx; margin-bottom: 20rpx;
width: 220rpx; width: 320rpx;
height: 280rpx; height: 300rpx;
vertical-align: top; vertical-align: top;
} }
} }

18
pages/found/index.vue
View File

@@ -9,7 +9,7 @@
签到成功 签到成功
</view> </view>
<view class="signPop-cont-text"> <view class="signPop-cont-text">
积分<view class="signPop-cont-number">+{{sign.signSuccess}}</view> 贡献值<view class="signPop-cont-number">+{{sign.signSuccess}}</view>
</view> </view>
</view> </view>
</view> </view>
@@ -17,7 +17,7 @@
<!-- 签到 --> <!-- 签到 -->
<view class="signCont"> <view class="signCont">
<view class="content-title">发现更多</view> <view class="content-title">发现更多</view>
<view class="content-sumite">海量积分等你解锁</view> <view class="content-sumite">海量贡献值等你解锁</view>
<view class="sign"> <view class="sign">
<view class="sign-list" :class="{ active: item.sign }" v-for="(item, index) in sign.signArr" <view class="sign-list" :class="{ active: item.sign }" v-for="(item, index) in sign.signArr"
:key="index"> :key="index">
@@ -39,25 +39,25 @@
</view> </view>
</view> </view>
</view> </view>
<view class="sign-record">再签到{{ sign.nextTask.day }}天额外赠送{{ sign.nextTask.diff }}个积分</view> <view class="sign-record">再签到{{ sign.nextTask.day }}天额外赠送{{ sign.nextTask.diff }}个贡献值</view>
</view> </view>
<view class="signBtn"> <view class="signBtn">
<block v-if="sign.signCan"> <block v-if="sign.signCan">
<view class="signBtn-go" @click="signClick" style="cursor:pointer"> <view class="signBtn-go" @click="signClick" style="cursor:pointer">
<u-icon name="calendar-fill" color="#333" size="40" /> <u-icon name="calendar-fill" color="#333" size="40" />
签到领取积分 签到领取贡献值
</view> </view>
</block> </block>
<block v-else> <block v-else>
<view class="signBtn-go" @click="$Router.push({name:'Fragment'})"> <view class="signBtn-go" @click="$Router.push({name:'Fragment'})">
积分记录<image class="signBtn-go-icon" src="/static/user/sign_arrow.png" mode="aspectFill"></image> 贡献值记录<image class="signBtn-go-icon" src="/static/user/sign_arrow.png" mode="aspectFill"></image>
</view> </view>
</block> </block>
</view> </view>
<!-- 水晶任务 --> <!-- 水晶任务 -->
<view class="task"> <view class="task">
<view class="task-liest"> <view class="task-liest">
积分任务 贡献值任务
</view> </view>
<block v-for="(item, index) in task" :key="index"> <block v-for="(item, index) in task" :key="index">
<view class="task-item" v-if="item.rule.name != 'sign_crystal'" <view class="task-item" v-if="item.rule.name != 'sign_crystal'"
@@ -99,7 +99,7 @@
tipsContent: '', // 弹出的动态内容 tipsContent: '', // 弹出的动态内容
tipsState: false // 弹出的动态状态 tipsState: false // 弹出的动态状态
}, },
energyShard: '' // 积分说明 energyShard: '' // 贡献值说明
} }
}, },
onShow() { onShow() {
@@ -144,10 +144,10 @@
}) })
}, },
// 积分提示信息 // 贡献值提示信息
showHelp() { showHelp() {
uni.showModal({ uni.showModal({
title: '积分', title: '贡献值',
confirmColor: '#8b64fd', confirmColor: '#8b64fd',
content: this.energyShard.description, content: this.energyShard.description,
showCancel: false showCancel: false

1
pages/found/task.vue
View File

@@ -21,7 +21,6 @@
taskInfo() { taskInfo() {
// 领取水晶 // 领取水晶
thawlog().then(res => { thawlog().then(res => {
console.log(res)
}).catch(err => { }).catch(err => {
uni.showToast({ uni.showToast({
icon: 'none', icon: 'none',

1
pages/goods/add.vue
View File

@@ -419,7 +419,6 @@
} }
if(authRes.confirm){ if(authRes.confirm){
let goodsId = this.$Route.query.type === 'edit' ? this.$Route.query.id : res let goodsId = this.$Route.query.type === 'edit' ? this.$Route.query.id : res
console.log(goodsId)
this.$Router.push({name: 'goodsAddAuth', params: { id: goodsId , type: 'goodsAdd', edit: this.$Route.query.type === 'edit'}}) this.$Router.push({name: 'goodsAddAuth', params: { id: goodsId , type: 'goodsAdd', edit: this.$Route.query.type === 'edit'}})
} }
} }

1
pages/goods/confirmOrder.vue
View File

@@ -205,7 +205,6 @@
}, 3000); }, 3000);
}, },
fail: (err) => { fail: (err) => {
console.log('payerr', err)
uni.showToast({ uni.showToast({
title: '支付失败', title: '支付失败',
duration: 3000, duration: 3000,

1094
pages/goods/details.vue
View File

File diff suppressed because it is too large Load Diff

1
pages/goods/goodsAuth.vue
View File

@@ -96,7 +96,6 @@
methods: { methods: {
// picker选择 // picker选择
pickerChange(e, key){ pickerChange(e, key){
console.log(key,e.detail.value)
this[key] = e.detail.value this[key] = e.detail.value
}, },
// 图片预览 // 图片预览

20
pages/goods/lists.vue
View File

@@ -1,5 +1,6 @@
<template> <template>
<view class="Goods-LISTS"> <view class="Goods-LISTS">
<!-- <image :src="`${config.apiUrls}images/baodan-banner.png`" mode="widthFix" /> -->
<view class="tabs"> <view class="tabs">
<view class="tabs-item" :class="{'show': tabIndex == 0}" @click="onTabs" data-index="0">最新</view> <view class="tabs-item" :class="{'show': tabIndex == 0}" @click="onTabs" data-index="0">最新</view>
<view class="tabs-item" :class="{'show': tabIndex == 1}" @click="onTabs" data-index="1"> <view class="tabs-item" :class="{'show': tabIndex == 1}" @click="onTabs" data-index="1">
@@ -19,6 +20,9 @@
list list
} from '@/apis/interfaces/goods' } from '@/apis/interfaces/goods'
import goodsList from '@/components/goods-list/goods-list' import goodsList from '@/components/goods-list/goods-list'
import {
config
} from '@/apis/index.js'
export default { export default {
name: 'Goods-LISTS', name: 'Goods-LISTS',
data() { data() {
@@ -28,6 +32,7 @@
goods: [], goods: [],
page: 1, page: 1,
has_more: true, has_more: true,
isBaoDan: false, // 是否是报单，默认有id不是报单，无id是报单
}; };
}, },
onReachBottom() { onReachBottom() {
@@ -44,6 +49,14 @@
created() { created() {
this.getList() this.getList()
}, },
onShow() {
if (this.$Route.query.type === 'baodan') {
this.isBaoDan = true
uni.setNavigationBarTitle({
title: '报单商品'
})
}
},
methods: { methods: {
onTabs(e) { onTabs(e) {
let index = e.target.dataset.index let index = e.target.dataset.index
@@ -58,7 +71,7 @@
onGoods(e) { onGoods(e) {
uni.navigateTo({ uni.navigateTo({
url:'/pages/goods/details?id='+e.goods_id url: '/pages/goods/details?id=' + e.goods_id
}) })
// this.$Router.push({ // this.$Router.push({
// name: 'goodsDetails', // name: 'goodsDetails',
@@ -72,8 +85,11 @@
order_by: this.tabIndex == 1 ? this.marketType : '', order_by: this.tabIndex == 1 ? this.marketType : '',
page: this.page page: this.page
} }
if (this.$Route.query.type) { if (this.$Route.query.type === 'id') {
data.category_id = this.$Route.query.id data.category_id = this.$Route.query.id
} else if (this.$Route.query.type === 'baodan') {
// 报单加个条件筛选
data.is_allow_values = 1
} else { } else {
data.category_cid = this.$Route.query.id data.category_cid = this.$Route.query.id
} }

3
pages/goods/management.vue
View File

@@ -8,7 +8,7 @@
<view class="item" :class="{'show': status == '3'}" @click="onTabs('3')">已驳回</view> <view class="item" :class="{'show': status == '3'}" @click="onTabs('3')">已驳回</view>
</view> </view>
<!-- 优选商品 --> <!-- 优选商品 -->
<goodsList :list="goods" priceType="CNY" :status='status' toast="暂无产品权证"> <goodsList :list="goods" priceType="CNY" :status='status' toast="暂无产品权证" notag='has'>
<template v-slot:statistics="goods"> <template v-slot:statistics="goods">
<view>库存{{goods.value.stock}}</view> <view>库存{{goods.value.stock}}</view>
</template> </template>
@@ -127,7 +127,6 @@
cancelText : '确定', cancelText : '确定',
success : res => { success : res => {
if(res.confirm){ if(res.confirm){
console.log(res.confirm)
this.$Router.push({name: 'goodsAdd', params: {type: 'edit', id}}) this.$Router.push({name: 'goodsAdd', params: {type: 'edit', id}})
} }
} }

12
pages/index/index.vue
View File

@@ -9,7 +9,7 @@
<image src="@/static/icons/gemstone-icon.png" />{{isAuth ? '通证' + account.coin : '查看通证'}} <image src="@/static/icons/gemstone-icon.png" />{{isAuth ? '通证' + account.coin : '查看通证'}}
</view> </view>
<view class="item nowrap" @click="navAccount('Fragment')"> <view class="item nowrap" @click="navAccount('Fragment')">
<image src="@/static/icons/crystal-icon.png" />{{isAuth ? '积分' + account.crystal : '查看积分'}} <image src="@/static/icons/crystal-icon.png" />{{isAuth ? '贡献值' + account.crystal : '查看贡献值'}}
</view> </view>
</view> </view>
</view> </view>
@@ -58,7 +58,7 @@
<image :src="item.cover" /> <image :src="item.cover" />
</view> </view>
<view class="title nowrap">{{item.title}}</view> <view class="title nowrap">{{item.title}}</view>
<view class="submit-title nowrap">积分{{item.tips}}</view> <view class="submit-title nowrap">贡献值{{item.tips}}</view>
</view> </view>
</scroll-view> </scroll-view>
<!-- 平台概况 --> <!-- 平台概况 -->
@@ -86,7 +86,7 @@
<view class="number nowrap">{{chains.up}}</view> <view class="number nowrap">{{chains.up}}</view>
</view> </view>
<view class="header-item"> <view class="header-item">
<view class="title">昨日瓜分积分 <view class="title">昨日瓜分贡献值
<uni-icons class="help-icon" @click="showHelp('score')" type="help-filled" size="15" <uni-icons class="help-icon" @click="showHelp('score')" type="help-filled" size="15"
color="rgba(255,255,255,.3)" /> color="rgba(255,255,255,.3)" />
</view> </view>
@@ -174,9 +174,6 @@
}, },
// 查看钱包账户 // 查看钱包账户
navAccount(pathName) { navAccount(pathName) {
console.log(1111)
if (!this.isAuth) { if (!this.isAuth) {
this.$Router.push({ this.$Router.push({
name: 'Login' name: 'Login'
@@ -217,7 +214,6 @@
success: res => { success: res => {
if (res.confirm) { if (res.confirm) {
if (pathName === 'vipIndex') { if (pathName === 'vipIndex') {
console.log(this.userAuth.identity)
this.$Router.push({ this.$Router.push({
name: 'vipIndex', name: 'vipIndex',
params: { params: {
@@ -234,7 +230,7 @@
} }
}) })
}, },
// 领取积分 // 领取贡献值
ledCrystal(index) { ledCrystal(index) {
// 播放音频 // 播放音频
const innerAudioContext = uni.createInnerAudioContext(); const innerAudioContext = uni.createInnerAudioContext();

1
pages/user/address/create.vue
View File

@@ -105,7 +105,6 @@
city_id: this.addressIdList[1], city_id: this.addressIdList[1],
district_id: this.addressIdList[2] district_id: this.addressIdList[2]
} }
console.log(params,'params。。。')
if (params.name.trim() === '') { if (params.name.trim() === '') {
uni.showToast({ uni.showToast({
title: '请重新核对姓名', title: '请重新核对姓名',

2
pages/user/address/list.vue
View File

@@ -59,7 +59,6 @@
}, },
onLoad(e) { onLoad(e) {
console.log(e)
if (e.type !== undefined) { if (e.type !== undefined) {
this.type = e.type this.type = e.type
} }
@@ -140,7 +139,6 @@
addresses().then(res => { addresses().then(res => {
this.addressLists = res this.addressLists = res
uni.stopPullDownRefresh() uni.stopPullDownRefresh()
console.log(this.type === '1', this.type)
if (this.type == '1') { if (this.type == '1') {
if (this.addressLists.length === 0) { if (this.addressLists.length === 0) {
let pages = getCurrentPages(); let pages = getCurrentPages();

2
pages/user/code.vue
View File

@@ -34,7 +34,7 @@
</swiper> </swiper>
</view> </view>
<view class="footer"> <view class="footer">
<view class="hith">朋友通过你的邀请注册成功后，将与您绑定好友关系通过成为平台用户，你都可以获得积分奖励。</view> <view class="hith">朋友通过你的邀请注册成功后，将与您绑定好友关系通过成为平台用户，你都可以获得贡献值奖励。</view>
<view class="number"> <view class="number">
<view class="title">邀请码 : {{inviteData[0].invite}}</view> <view class="title">邀请码 : {{inviteData[0].invite}}</view>
<view class="value" @click="copyCenter(inviteData[0].invite)">复制邀请码</view> <view class="value" @click="copyCenter(inviteData[0].invite)">复制邀请码</view>

7
pages/user/index.vue
View File

@@ -142,7 +142,7 @@
<view class="assets-label-number">{{userData.account.cash || 0}}</view> <view class="assets-label-number">{{userData.account.cash || 0}}</view>
</view> </view>
<view class="assets-label" @click="$Router.push({name:'Fragment'})"> <view class="assets-label" @click="$Router.push({name:'Fragment'})">
<view class="assets-label-name">积分 <view class="assets-label-name">贡献值
<image @click.stop="showHelp('chip')" class="assets-label-icon" <image @click.stop="showHelp('chip')" class="assets-label-icon"
src="/static/user/userAssets_tips.png" /> src="/static/user/userAssets_tips.png" />
</view> </view>
@@ -391,9 +391,6 @@
userInfo() { userInfo() {
// 读取配置信息 // 读取配置信息
userIndex().then(res => { userIndex().then(res => {
console.log(res)
res.account = { res.account = {
stone: res.stone, stone: res.stone,
stone_value: res.stone_value, stone_value: res.stone_value,
@@ -455,7 +452,7 @@
showHelp(type) { showHelp(type) {
let title = '通证', let title = '通证',
content = this.helpDoc.energy_ball.description content = this.helpDoc.energy_ball.description
if (type == 'chip') title = '积分' if (type == 'chip') title = '贡献值'
if (type == 'chip') content = this.helpDoc.energy_shard.description if (type == 'chip') content = this.helpDoc.energy_shard.description
uni.showModal({ uni.showModal({
title: title, title: title,

3
pages/user/order/logistics.vue
View File

@@ -48,7 +48,6 @@
methods: { methods: {
getLogistic(no) { getLogistic(no) {
mallShipmentsLogistic(no).then(res => { mallShipmentsLogistic(no).then(res => {
console.log(res)
this.list = res.logistics this.list = res.logistics
this.express = res.express this.express = res.express
this.loaded = true this.loaded = true
@@ -65,8 +64,6 @@
uni.setClipboardData({ uni.setClipboardData({
data: no, data: no,
success: res=>{ success: res=>{
console.log('success');
console.log(res)
} }
}); });
}, },

598
pages/user/order/mallRefund.vue
View File

@@ -1,326 +1,330 @@
<template> <template>
<view class="NumberWeight"> <view class="NumberWeight">
<!-- 订单分类 --> <!-- 订单分类 -->
<scroll-view class="nav" scroll-x="true" :scroll-into-view='selectCategoryId' scroll-with-animation="true"> <scroll-view class="nav" scroll-x="true" :scroll-into-view='selectCategoryId' scroll-with-animation="true">
<view :class="['nav-item' ,selectNavId === item.id?'nav-item-selected':'']" v-for="(item,index) in navList" <view :class="['nav-item' ,selectNavId === item.id?'nav-item-selected':'']" v-for="(item,index) in navList"
:key="index" @click="selectNav(item.id)"> :key="index" @click="selectNav(item.id)">
{{item.name}} {{item.name}}
{{item.id ==='apply' && count.apply >0 ? '('+count.apply + ')':''}} {{item.id ==='apply' && count.apply >0 ? '('+count.apply + ')':''}}
{{item.id ==='deliver' && count.deliver >0 ?'('+count.deliver + ')':''}} {{item.id ==='deliver' && count.deliver >0 ?'('+count.deliver + ')':''}}
{{item.id ==='delivered' && count.delivered >0 ?'('+count.delivered + ')':''}} {{item.id ==='delivered' && count.delivered >0 ?'('+count.delivered + ')':''}}
{{item.id ==='signed' && count.signed >0 ?'('+count.signed + ')':''}} {{item.id ==='signed' && count.signed >0 ?'('+count.signed + ')':''}}
{{item.id ==='process' && count.process >0 ?'('+count.process + ')':''}} {{item.id ==='process' && count.process >0 ?'('+count.process + ')':''}}
{{item.id ==='completed' && count.completed >0 ?'('+count.completed + ')':''}} {{item.id ==='completed' && count.completed >0 ?'('+count.completed + ')':''}}
</view>
</scroll-view>
<!-- 有订单列表 -->
<view class="" v-if="lists.length > 0">
<!-- 订单列表 -->
<view class="order-list" v-for="(item,index) in lists" :key="index">
<MallRefundsTemplate :item="item" />
<view class="actions">
<view @click="goDetail(item.refund_id)" class="nowPay">查看详情</view>
</view>
</view>
</view> </view>
</scroll-view> <!-- 没有订单列表 -->
<no-list v-if="lists.length === 0" name='no-order' txt="暂无数据~" />
<!-- 有订单列表 -->
<view class="" v-if="lists.length > 0"> <!-- <u-toast ref="uToast" /> -->
<!-- 订单列表 --> <u-toast ref="uToast" />
<view class="order-list" v-for="(item,index) in lists" :key="index"> </view>
<MallRefundsTemplate :item="item" />
<view class="actions">
<view @click="goDetail(item.refund_id)" class="nowPay">查看详情</view>
</view>
</view>
</view>
<!-- 没有订单列表 -->
<no-list v-if="lists.length === 0" name='no-order' txt="暂无数据~" />
<!-- <u-toast ref="uToast" /> -->
<u-toast ref="uToast" />
</view>
</template> </template>
<script> <script>
import { import {
MallRefundsTemplate MallRefundsTemplate
} from '@/components/mall-refunds-template/mall-refunds-template' } from '@/components/mall-refunds-template/mall-refunds-template'
import { mallRefunds } from '@/apis/interfaces/numberWeight' import {
export default { mallRefunds
components: { } from '@/apis/interfaces/numberWeight'
MallRefundsTemplate export default {
}, components: {
data() { MallRefundsTemplate
return {
lists: [],
page:1,
total:0,
navList: [{
name: '待审核',
id: 'apply'
},{
name: '待返货',
id: 'deliver'
},{
name: '待签收',
id: 'delivered'
},{
name: '已签收',
id: 'signed'
},
{
name: '待退权证',
id: 'process'
},
{
name: '完成退货',
id: 'completed'
}
],
selectNavId: 'apply',
count:{}
};
},
onLoad() {
this.getList()
},
onShow(){
console.log(uni.getStorageSync('refresh'),'getStorageSync')
if(uni.getStorageSync('refresh')){
this.reset()
}
},
onUnload() {
uni.setStorageSync('refresh',false)
},
onReachBottom() {
if(this.total>this.lists.length){
this.page = this.page + 1
this.getList()
}else{
this.$refs.uToast.show({
title: '吼吼吼~我是有底的~',
type: 'error',icon:false,
duration: 3000
})
}
},
methods: {
reset(){
this.page =1
this.total = 0
this.lists = []
this.getList()
uni.setStorageSync('refresh',false)
}, },
// 选择订单 data() {
selectNav(id) { return {
if (this.selectNavId !== id) { lists: [],
this.selectNavId = id page: 1,
this.reset() total: 0,
} navList: [{
name: '待审核',
id: 'apply'
}, {
name: '待返货',
id: 'deliver'
}, {
name: '待签收',
id: 'delivered'
}, {
name: '已签收',
id: 'signed'
},
{
name: '待退权证',
id: 'process'
},
{
name: '完成退货',
id: 'completed'
}
],
selectNavId: 'apply',
count: {}
};
}, },
// 获取订单列表 onLoad() {
getList(){ this.getList()
let data = { },
pageSize:20, onShow() {
page:this.page, if (uni.getStorageSync('refresh')) {
state:this.selectNavId this.reset()
} }
mallRefunds(data).then(res=>{ },
console.log(res) onUnload() {
this.count = res.count uni.setStorageSync('refresh', false)
this.lists = this.lists.concat(res.lists.data) },
this.total = res.lists.page.total onReachBottom() {
}).catch(err=>{ if (this.total > this.lists.length) {
this.page = this.page + 1
this.getList()
} else {
this.$refs.uToast.show({ this.$refs.uToast.show({
title: err.message, title: '吼吼吼~我是有底的~',
type: 'error',icon:false, type: 'error',
duration: 3000 icon: false,
duration: 3000
}) })
}) }
}, },
// 取消提货单 methods: {
nowCancel(index,no){ reset() {
console.log(index,no) this.page = 1
uni.showModal({ this.total = 0
title: '哎呦，提醒你', this.lists = []
content: '是否确认要取消订单啊，取消后请去我的权证中查看', this.getList()
success: (res) =>{ uni.setStorageSync('refresh', false)
if (res.confirm) { },
mallShipmentsCancel(no).then(res=>{ // 选择订单
console.log(res) selectNav(id) {
this.$refs.uToast.show({ if (this.selectNavId !== id) {
title:res, this.selectNavId = id
type: 'error',icon:false, this.reset()
duration: 3000 }
},
// 获取订单列表
getList() {
let data = {
pageSize: 20,
page: this.page,
state: this.selectNavId
}
mallRefunds(data).then(res => {
this.count = res.count
this.lists = this.lists.concat(res.lists.data)
this.total = res.lists.page.total
}).catch(err => {
this.$refs.uToast.show({
title: err.message,
type: 'error',
icon: false,
duration: 3000
})
})
},
// 取消提货单
nowCancel(index, no) {
uni.showModal({
title: '哎呦，提醒你',
content: '是否确认要取消订单啊，取消后请去我的权证中查看',
success: (res) => {
if (res.confirm) {
mallShipmentsCancel(no).then(res => {
this.$refs.uToast.show({
title: res,
type: 'error',
icon: false,
duration: 3000
})
this.lists.splice(index, 1)
this.total = this.total - 1
}).catch(err => {
this.$refs.uToast.show({
title: err.message,
type: 'error',
icon: false,
duration: 3000
})
}) })
this.lists.splice(index,1) } else if (res.cancel) {
this.total = this.total - 1
}).catch(err=>{
this.$refs.uToast.show({
title: err.message,
type: 'error',icon:false,
duration: 3000
})
})
} else if (res.cancel) {
this.$refs.uToast.show({
title:'放弃了~',
type: 'error',icon:false,
duration: 3000
})
}
}
});
},
// 签收提货单
nowSign(index,no){
console.log(index,no)
uni.showModal({
title: '哎呦，提醒你',
content: '是否确认已经收到商品了呀',
success: (res) =>{
if (res.confirm) {
console.log(no)
mallShipmentsSign(no).then(res=>{
console.log(res)
this.$refs.uToast.show({ this.$refs.uToast.show({
title:res, title: '放弃了~',
type: 'error',icon:false, type: 'error',
duration: 3000 icon: false,
duration: 3000
}) })
this.lists.splice(index,1) }
this.total = this.total - 1 }
}).catch(err=>{ });
this.$refs.uToast.show({
title: err.message, },
type: 'error',icon:false, // 签收提货单
duration: 3000 nowSign(index, no) {
}) uni.showModal({
}) title: '哎呦，提醒你',
content: '是否确认已经收到商品了呀',
} else if (res.cancel) { success: (res) => {
this.$refs.uToast.show({ if (res.confirm) {
title:'放弃了~', mallShipmentsSign(no).then(res => {
type: 'error',icon:false, this.$refs.uToast.show({
duration: 3000 title: res,
}) type: 'error',
} icon: false,
} duration: 3000
}); })
}, this.lists.splice(index, 1)
this.total = this.total - 1
// 查看详情 }).catch(err => {
goDetail(no){ this.$refs.uToast.show({
this.$router.push({ title: err.message,
name: 'MallRefundsInfo', type: 'error',
params:{ icon: false,
no:no duration: 3000
} })
}) })
} else if (res.cancel) {
this.$refs.uToast.show({
title: '放弃了~',
type: 'error',
icon: false,
duration: 3000
})
}
}
});
},
// 查看详情
goDetail(no) {
this.$router.push({
name: 'MallRefundsInfo',
params: {
no: no
}
})
}
} }
} }
}
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
page { page {
width: 100%; width: 100%;
height: 100%; height: 100%;
} }
.NumberWeight { .NumberWeight {
width: 100%; width: 100%;
min-height: 100vh; min-height: 100vh;
box-sizing: border-box; box-sizing: border-box;
background-color: #F7F7F7; background-color: #F7F7F7;
// 订单nav // 订单nav
.nav { .nav {
display: flex; display: flex;
flex-direction: row; flex-direction: row;
align-items: center; align-items: center;
justify-content: flex-start; justify-content: flex-start;
box-sizing: border-box; box-sizing: border-box;
white-space: nowrap; white-space: nowrap;
font-size: $title-size*0.95; font-size: $title-size*0.95;
padding: 0 30rpx; padding: 0 30rpx;
background-color: #fff; background-color: #fff;
color: #666; color: #666;
border-top: solid 20rpx #f7f7f7; border-top: solid 20rpx #f7f7f7;
position: sticky; position: sticky;
top: 0rpx; top: 0rpx;
z-index: 1; z-index: 1;
.nav-item { .nav-item {
display: inline-block; display: inline-block;
border-bottom: solid 4rpx #fff; border-bottom: solid 4rpx #fff;
padding: 30rpx 10rpx; padding: 30rpx 10rpx;
margin-right: 10rpx; margin-right: 10rpx;
} }
.nav-item-selected { .nav-item-selected {
border-bottom: solid 4rpx $main-color; border-bottom: solid 4rpx $main-color;
color: $main-color; color: $main-color;
} }
} }
// 订单列表 // 订单列表
.order-list { .order-list {
background-color: #fff; background-color: #fff;
border-radius: 20rpx; border-radius: 20rpx;
min-height: 300rpx; min-height: 300rpx;
margin: 30rpx 20rpx 0 20rpx; margin: 30rpx 20rpx 0 20rpx;
padding:30rpx 30rpx 20rpx 30rpx ; padding: 30rpx 30rpx 20rpx 30rpx;
// border-top: solid 4rpx #cacaca; // border-top: solid 4rpx #cacaca;
// 操作信息 // 操作信息
.actions { .actions {
display: flex; display: flex;
flex-direction: row; flex-direction: row;
align-items: center; align-items: center;
justify-content: flex-end; justify-content: flex-end;
box-sizing: border-box; box-sizing: border-box;
flex-wrap: wrap; flex-wrap: wrap;
flex: 1; flex: 1;
font-size: 28rpx; font-size: 28rpx;
color: #fff; color: #fff;
border-top: solid 1rpx #EFF4F2; border-top: solid 1rpx #EFF4F2;
.nowPay {
padding: 4rpx 20rpx;
border-radius: 40rpx;
margin-left: 20rpx;
margin-top: 20rpx;
// background-color: $main-color;
color: #999;
border:solid 1rpx #cacaca;
}
.cancelOrder { .nowPay {
padding: 10rpx 30rpx; padding: 4rpx 20rpx;
border-radius: 40rpx; border-radius: 40rpx;
margin-left: 20rpx; margin-left: 20rpx;
margin-top: 20rpx; margin-top: 20rpx;
background-color: #DD524D; // background-color: $main-color;
} color: #999;
border: solid 1rpx #cacaca;
}
.logistics { .cancelOrder {
background-color: $main-color; padding: 10rpx 30rpx;
padding: 10rpx 30rpx; border-radius: 40rpx;
border-radius: 40rpx; margin-left: 20rpx;
margin-left: 20rpx; margin-top: 20rpx;
margin-top: 20rpx; background-color: #DD524D;
} }
.sign { .logistics {
background-color: #DD524D; background-color: $main-color;
padding: 10rpx 30rpx; padding: 10rpx 30rpx;
border-radius: 40rpx; border-radius: 40rpx;
margin-left: 20rpx; margin-left: 20rpx;
margin-top: 20rpx; margin-top: 20rpx;
} }
.evaluate { .sign {
background-color: $main-color; background-color: #DD524D;
padding: 10rpx 30rpx; padding: 10rpx 30rpx;
border-radius: 40rpx; border-radius: 40rpx;
margin-left: 20rpx; margin-left: 20rpx;
margin-top: 20rpx; margin-top: 20rpx;
} }
}
} .evaluate {
} background-color: $main-color;
padding: 10rpx 30rpx;
border-radius: 40rpx;
margin-left: 20rpx;
margin-top: 20rpx;
}
}
}
}
</style> </style>

2
pages/user/order/mallRefundsInfo.vue
View File

@@ -128,7 +128,6 @@
}) })
}, },
priveImg(index,idx){ priveImg(index,idx){
console.log(this.logs[index].pictures);
uni.previewImage({ uni.previewImage({
current:idx, current:idx,
urls:this.logs[index].pictures urls:this.logs[index].pictures
@@ -163,7 +162,6 @@
success: (res) => { success: (res) => {
if (res.confirm) { if (res.confirm) {
mallRefundsDeliver(data).then(res => { mallRefundsDeliver(data).then(res => {
console.log(res)
this.$refs.uToast.show({ this.$refs.uToast.show({
title: res, title: res,
type: 'error',icon:false, type: 'error',icon:false,

8
pages/user/order/mallShipments.vue
View File

@@ -158,7 +158,6 @@
this.getList() this.getList()
}, },
onShow() { onShow() {
console.log(uni.getStorageSync('refresh'), 'getStorageSync')
if (uni.getStorageSync('refresh')) { if (uni.getStorageSync('refresh')) {
this.reset() this.reset()
} }
@@ -196,7 +195,6 @@
}, },
// 快递单post 提货单 take 退货单refund // 快递单post 提货单 take 退货单refund
selectType(id,index) { selectType(id,index) {
console.log('id：' + id)
if (this.selectTypeId !== id) { if (this.selectTypeId !== id) {
this.state = this.typeList[index].categrery[0].id this.state = this.typeList[index].categrery[0].id
this.selectTypeId = id this.selectTypeId = id
@@ -221,7 +219,6 @@
apiUrl = 'mall/refunds' apiUrl = 'mall/refunds'
} }
mallShipmentsPostShop(apiUrl, data).then(res => { mallShipmentsPostShop(apiUrl, data).then(res => {
console.log(res.count)
this.count = res.count this.count = res.count
this.lists = this.lists.concat(res.lists.data) this.lists = this.lists.concat(res.lists.data)
this.total = res.lists.page.total this.total = res.lists.page.total
@@ -236,14 +233,12 @@
}, },
// 取消提货单 // 取消提货单
nowCancel(index, no) { nowCancel(index, no) {
console.log(index, no)
uni.showModal({ uni.showModal({
title: '哎呦，提醒你', title: '哎呦，提醒你',
content: '是否确认要取消订单啊，取消后请去我的权证中查看', content: '是否确认要取消订单啊，取消后请去我的权证中查看',
success: (res) => { success: (res) => {
if (res.confirm) { if (res.confirm) {
mallShipmentsCancel(no).then(res => { mallShipmentsCancel(no).then(res => {
console.log(res)
this.$refs.uToast.show({ this.$refs.uToast.show({
title: res, title: res,
type: 'error', type: 'error',
@@ -274,15 +269,12 @@
}, },
// 签收提货单 // 签收提货单
nowSign(index, no) { nowSign(index, no) {
console.log(index, no)
uni.showModal({ uni.showModal({
title: '哎呦，提醒你', title: '哎呦，提醒你',
content: '是否确认已经收到商品了呀', content: '是否确认已经收到商品了呀',
success: (res) => { success: (res) => {
if (res.confirm) { if (res.confirm) {
console.log(no)
mallShipmentsSign(no).then(res => { mallShipmentsSign(no).then(res => {
console.log(res)
this.$refs.uToast.show({ this.$refs.uToast.show({
title: res, title: res,
type: 'error', type: 'error',

1308
pages/user/order/mallShipmentsInfo.vue
View File

File diff suppressed because it is too large Load Diff

9
pages/user/order/mallShipmentsRefund.vue
View File

@@ -87,7 +87,6 @@
methods: { methods: {
// 预览上传图片 // 预览上传图片
priviewImg(index) { priviewImg(index) {
console.log(index, this.pictures.showpath)
uni.previewImage({ uni.previewImage({
current: index, current: index,
urls: this.pictures.showpath urls: this.pictures.showpath
@@ -97,7 +96,6 @@
updImgs(type) { updImgs(type) {
uni.chooseImage({ uni.chooseImage({
success: res => { success: res => {
console.log(res)
let path = res.tempFiles.map((val, index) => { let path = res.tempFiles.map((val, index) => {
return { return {
name: 'uploads' + index, name: 'uploads' + index,
@@ -105,12 +103,10 @@
} }
}) })
uploads(path).then(pathRes => { uploads(path).then(pathRes => {
// console.log(pathRes)
this.pictures = { this.pictures = {
path: [...this.pictures.path, ...pathRes.path], path: [...this.pictures.path, ...pathRes.path],
showpath: [...this.pictures.showpath, ...pathRes.url] showpath: [...this.pictures.showpath, ...pathRes.url]
} }
console.log(this.pictures)
}).catch(err => { }).catch(err => {
uni.showToast({ uni.showToast({
title: err.message, title: err.message,
@@ -122,11 +118,8 @@
}, },
// 删除图片 // 删除图片
closeImg(index) { closeImg(index) {
console.log(index)
this.pictures.path.splice(index, 1) this.pictures.path.splice(index, 1)
this.pictures.showpath.splice(index, 1) this.pictures.showpath.splice(index, 1)
console.log(this.pictures);
}, },
// 获取退货的基本信息 // 获取退货的基本信息
getInfo(shipment_no) { getInfo(shipment_no) {
@@ -139,7 +132,6 @@
} }
lists.push(items) lists.push(items)
}) })
console.log(lists)
this.list = lists this.list = lists
}).catch(err => { }).catch(err => {
this.$refs.uToast.show({ this.$refs.uToast.show({
@@ -182,7 +174,6 @@
success: (res) => { success: (res) => {
if (res.confirm) { if (res.confirm) {
mallShipmentsRefund(data).then(res => { mallShipmentsRefund(data).then(res => {
console.log(res)
this.$refs.uToast.show({ this.$refs.uToast.show({
title: res, title: res,
type: 'error',icon:false, type: 'error',icon:false,

1
pages/user/order/numberWeight.vue
View File

@@ -68,7 +68,6 @@
page: this.page page: this.page
} }
mallWarrants(data).then(res => { mallWarrants(data).then(res => {
console.log(res)
this.lists = this.lists.concat(res.data) this.lists = this.lists.concat(res.data)
this.total = res.total this.total = res.total
}).catch(err => { }).catch(err => {

3
pages/user/order/numberWeightInfo.vue
View File

@@ -224,11 +224,9 @@
} }
data.store_id = '' data.store_id = ''
} }
console.log(data)
// 快递单继续沿用之前的信息 // 快递单继续沿用之前的信息
if (data.type === '1') { if (data.type === '1') {
mallWarrantsSure(data).then(res => { mallWarrantsSure(data).then(res => {
console.log(res)
this.$refs.uToast.show({ this.$refs.uToast.show({
title: res, title: res,
type: 'error',icon:false, type: 'error',icon:false,
@@ -250,7 +248,6 @@
// 提货或者服务单生成二维码 // 提货或者服务单生成二维码
else { else {
mallWarrantsQrcode(data).then(res => { mallWarrantsQrcode(data).then(res => {
console.log(res)
this.showCodeImg = res.code this.showCodeImg = res.code
// uni.setStorageSync('refresh', true) // uni.setStorageSync('refresh', true)
this.showCode = true this.showCode = true

2
pages/user/order/servicesOrder.vue
View File

@@ -63,7 +63,6 @@
this.getList() this.getList()
}, },
onShow(){ onShow(){
console.log(uni.getStorageSync('refresh'),'getStorageSync')
if(uni.getStorageSync('refresh')){ if(uni.getStorageSync('refresh')){
this.reset() this.reset()
} }
@@ -108,7 +107,6 @@
apiUrl = 'mall/shipments/service' apiUrl = 'mall/shipments/service'
data.channel = 'app' data.channel = 'app'
mallShipmentsPostShop(apiUrl,data).then(res=>{ mallShipmentsPostShop(apiUrl,data).then(res=>{
console.log(res.count)
this.count = res.count this.count = res.count
this.lists = this.lists.concat(res.lists.data) this.lists = this.lists.concat(res.lists.data)
this.total = res.lists.page.total this.total = res.lists.page.total

4
pages/user/order/servicesOrderInfo.vue
View File

@@ -102,10 +102,8 @@
}; };
}, },
onLoad(e) { onLoad(e) {
console.log(e)
this.shipment_no = e.no this.shipment_no = e.no
this.getInfo(e.no) this.getInfo(e.no)
console.log(this.shipment_no)
// this.getInfo('2021081817410747800300000004') // this.getInfo('2021081817410747800300000004')
}, },
onShow() { onShow() {
@@ -134,12 +132,10 @@
}) })
}, },
map(info) { map(info) {
console.log(info.latitude, info.longitude)
uni.openLocation({ uni.openLocation({
latitude: Number(info.latitude), latitude: Number(info.latitude),
longitude: Number(info.longitude), longitude: Number(info.longitude),
success: function() { success: function() {
console.log('success');
} }
}); });
} }

3
pages/verification/history.vue
View File

@@ -159,7 +159,6 @@
} }
scanList(apiUrl, data).then(res => { scanList(apiUrl, data).then(res => {
console.log(res)
this.account = res.all this.account = res.all
this.lists = this.lists.concat(res.lists.data) this.lists = this.lists.concat(res.lists.data)
this.has_more = res.lists.page.has_more this.has_more = res.lists.page.has_more
@@ -167,7 +166,6 @@
this.ShopList = [{name:'全部',store_id:''},...res.stores] this.ShopList = [{name:'全部',store_id:''},...res.stores]
this.isBos = res.isBos this.isBos = res.isBos
}).catch(err => { }).catch(err => {
console.log(err)
uni.showToast({ uni.showToast({
title: err.message, title: err.message,
type: 'error', type: 'error',
@@ -192,7 +190,6 @@
}, },
// 选择 年 月 日 切换要重置数据 // 选择 年 月 日 切换要重置数据
selectType(type) { selectType(type) {
console.log(type, typeof type)
if (this.type !== type) { if (this.type !== type) {
switch (type) { switch (type) {
case 'year': case 'year':

8
pages/verification/index.vue
View File

@@ -60,12 +60,9 @@
}, },
methods: { methods: {
scanCode(e) { scanCode(e) {
console.log(e)
this.scanType = e this.scanType = e
uni.scanCode({ uni.scanCode({
success: (res) => { success: (res) => {
console.log('条码类型：' + res.scanType);
console.log('条码内容：' + res.result);
// uni.showLoading({ // uni.showLoading({
// title: '核销请求中..' // title: '核销请求中..'
// }) // })
@@ -76,16 +73,13 @@
}, },
// 请求核销前置，优惠券前置和权证前置（get） post 是核销 // 请求核销前置，优惠券前置和权证前置（get） post 是核销
scanInfo(token, method) { scanInfo(token, method) {
console.log(token, this.scanType)
let apiUrl = '' let apiUrl = ''
let data = { let data = {
code: token code: token
} }
if (this.scanType === 'goods') { if (this.scanType === 'goods') {
console.log('权证核销')
apiUrl = 'manages/warrants/verification' apiUrl = 'manages/warrants/verification'
} else { } else {
console.log('优惠券核销！')
apiUrl = 'coupons/verify/coupon' apiUrl = 'coupons/verify/coupon'
} }
scanInfo(apiUrl, data, method).then(res => { scanInfo(apiUrl, data, method).then(res => {
@@ -104,8 +98,6 @@
this.info = res this.info = res
} }
} else { } else {
console.log('优惠券核销 有商品跳转优惠券详情页面，没有商品直接弹出核销页面！')
console.log(res, 'res')
if (method === 'post') { if (method === 'post') {
this.showCode = false this.showCode = false
this.$refs.uToast.show({ this.$refs.uToast.show({

1
pages/vip/examine.vue
View File

@@ -16,7 +16,6 @@
export default { export default {
methods:{ methods:{
toUser(){ toUser(){
console.log('trule')
uni.switchTab({ uni.switchTab({
url:'/pages/user/index' url:'/pages/user/index'
}) })

117
pages/vip/vip.vue
View File

@@ -98,7 +98,8 @@
<block v-else> <block v-else>
<view class="privilege-label" v-if="openCondition.certification" <view class="privilege-label" v-if="openCondition.certification"
:class="{ active: openCondition.certification.finish }"> :class="{ active: openCondition.certification.finish }">
{{ openCondition.certification.message }}</view> {{ openCondition.certification.message }}
</view>
</block> </block>
</view> </view>
</view> </view>
@@ -128,7 +129,8 @@
:src="identitie[tabsIndex].button_cover" mode="widthFix" @click="openOrder" /> :src="identitie[tabsIndex].button_cover" mode="widthFix" @click="openOrder" />
<view class="current-btn-sh" v-if="identitie[tabsIndex].can.show_button && voucher !== ''" <view class="current-btn-sh" v-if="identitie[tabsIndex].can.show_button && voucher !== ''"
@click="openOrder"> @click="openOrder">
{{voucher.status.value === 1?'申请审核中':''}}{{voucher.status.value === 3?'申请被驳回查看原因':''}}</view> {{voucher.status.value === 1?'申请审核中':''}}{{voucher.status.value === 3?'申请被驳回查看原因':''}}
</view>
<!-- <view class="current-btn-sh" v-if="!identitie[tabsIndex].can.show_button && voucher === ''">已开通</view> --> <!-- <view class="current-btn-sh" v-if="!identitie[tabsIndex].can.show_button && voucher === ''">已开通</view> -->
<view class="ios-bottom"></view> <view class="ios-bottom"></view>
</view> </view>
@@ -136,10 +138,23 @@
</template> </template>
<script> <script>
import { identities, vipOrder, vipWechatPay, vipCont, vipVoucherUpdate, vipVoucher } from '@/apis/interfaces/vip'; import {
import { wxConfig } from '@/apis/interfaces/wx'; identities,
import { getAliPayConfig } from '@/apis/interfaces/alipay' vipOrder,
import { uploads } from '@/apis/interfaces/uploading'; vipWechatPay,
vipCont,
vipVoucherUpdate,
vipVoucher
} from '@/apis/interfaces/vip';
import {
wxConfig
} from '@/apis/interfaces/wx';
import {
getAliPayConfig
} from '@/apis/interfaces/alipay'
import {
uploads
} from '@/apis/interfaces/uploading';
import cashierPay from '@/public/cashierPay' import cashierPay from '@/public/cashierPay'
export default { export default {
data() { data() {
@@ -166,7 +181,7 @@
}, },
created() { created() {
// 获取当前用户信息 // 获取当前用户信息
this.idenInfo('cre') this.idenInfo('cre')
}, },
methods: { methods: {
// 当前用户信息 // 当前用户信息
@@ -224,7 +239,7 @@
}, },
// 开通会员 // 开通会员
openOrder() { openOrder() {
let can = this.canBtn, let can = this.canBtn,
identitiesId = this.identitie[this.tabsIndex].identity_id; identitiesId = this.identitie[this.tabsIndex].identity_id;
if (this.selected == false) { if (this.selected == false) {
@@ -233,60 +248,60 @@
icon: 'none' icon: 'none'
}); });
return; return;
} }
if (can.on_line) { if (can.on_line) {
uni.showActionSheet({ uni.showActionSheet({
itemList: ['微信支付', '支付宝支付'], itemList: ['微信支付', '支付宝支付'],
success : res => { success: res => {
this.payAppConfig(res.tapIndex) this.payAppConfig(res.tapIndex)
} }
}) })
// //
} else { } else {
this.canClick() this.canClick()
} }
}, },
// 创建订单 // 创建订单
payAppConfig(payType){ payAppConfig(payType) {
let identity = this.identitie[this.tabsIndex].identity_id let identity = this.identitie[this.tabsIndex].identity_id
vipOrder(identity,{ vipOrder(identity, {
year:1, year: 1,
}).then(res=>{ }).then(res => {
if(payType === 0) this.wechatAppPay(res.id) if (payType === 0) this.wechatAppPay(res.id)
if(payType === 1) this.aliPayConfig(res.id) if (payType === 1) this.aliPayConfig(res.id)
}).catch(err=>{ }).catch(err => {
uni.showToast({
title: err.message,
icon: "none"
})
})
},
// 支付宝支付
aliPayConfig(orderId) {
getAliPayConfig(orderId, {
type: 'app'
}).then(res => {
cashierPay.pay('alipay', res.wechat).then(payRes => {
this.idenInfo()
})
}).catch(err => {
uni.showToast({ uni.showToast({
title: err.message, title: err.message,
icon: "none" icon: "none"
}) })
}) })
},
// 支付宝支付
aliPayConfig(orderId){
getAliPayConfig(orderId, {
type: 'app'
}).then(res => {
cashierPay.pay('alipay', res.wechat).then(payRes=> {
this.idenInfo()
})
}).catch(err => {
uni.showToast({
title:err.message,
icon:"none"
})
})
}, },
// 微信支付 APP // 微信支付 APP
wechatAppPay(orderId){ wechatAppPay(orderId) {
vipWechatPay(orderId,{ vipWechatPay(orderId, {
type: 'app' type: 'app'
}).then(res=>{ }).then(res => {
let payConfig = JSON.parse(res) let payConfig = JSON.parse(res)
cashierPay.pay('wxpay', payConfig).then(payRes=> { cashierPay.pay('wxpay', payConfig).then(payRes => {
this.idenInfo() this.idenInfo()
}) })
}).catch(err=>{ }).catch(err => {
uni.showToast({ uni.showToast({
title: err.message, title: err.message,
icon: "none" icon: "none"

4
pages/wallet/addBank.vue
View File

@@ -73,7 +73,6 @@
// 获取添加银行前置条件 // 获取添加银行前置条件
getAccountsCreate() { getAccountsCreate() {
accountsCreate().then(res => { accountsCreate().then(res => {
console.log(res)
this.banks = res.banks this.banks = res.banks
}).catch(err => { }).catch(err => {
this.$refs.uToast.show({ this.$refs.uToast.show({
@@ -86,7 +85,6 @@
// 编辑前置 // 编辑前置
getAccountsCreateEdit() { getAccountsCreateEdit() {
accountsCreateEdit(this.bank_account_id).then(res => { accountsCreateEdit(this.bank_account_id).then(res => {
console.log(res)
this.banks = res.banks this.banks = res.banks
this.no = res.info.no this.no = res.info.no
this.name = res.info.name this.name = res.info.name
@@ -104,7 +102,6 @@
}, },
// 选择银行 // 选择银行
selectBank(e) { selectBank(e) {
console.log(e[0])
this.selectBankObj = e[0] this.selectBankObj = e[0]
this.bank_id = e[0].value this.bank_id = e[0].value
}, },
@@ -158,7 +155,6 @@
} }
if (this.bank_account_id) { if (this.bank_account_id) {
data.bank_account_id = this.bank_account_id data.bank_account_id = this.bank_account_id
console.log(data)
this.withdrawsAccountsEdits(data) this.withdrawsAccountsEdits(data)
} else { } else {
this.withdrawsAccounts(data) this.withdrawsAccounts(data)

3
pages/wallet/bankList.vue
View File

@@ -73,7 +73,6 @@
page: this.page page: this.page
} }
withdrawsAccountsList(data).then(res => { withdrawsAccountsList(data).then(res => {
console.log(res)
this.lists = this.lists.concat(res.data) this.lists = this.lists.concat(res.data)
this.has_more = res.page.has_more this.has_more = res.page.has_more
uni.setStorageSync('refresh', false) uni.setStorageSync('refresh', false)
@@ -107,7 +106,6 @@
success(res) { success(res) {
if (res.confirm) { if (res.confirm) {
withdrawsAccountsDelete(id).then(res => { withdrawsAccountsDelete(id).then(res => {
console.log(res)
that.lists.splice(index, 1) that.lists.splice(index, 1)
if (that.lists.length === 0) { if (that.lists.length === 0) {
uni.navigateBack({}) uni.navigateBack({})
@@ -132,7 +130,6 @@
// } // }
// let pages = getCurrentPages() // let pages = getCurrentPages()
// let prevPage = pages[pages.length - 2] // let prevPage = pages[pages.length - 2]
// console.log(bankInfo)
// prevPage._data.bankInfo = bankInfo // prevPage._data.bankInfo = bankInfo
// uni.navigateBack() //返回上一页面 // uni.navigateBack() //返回上一页面

1
pages/wallet/extractRed.vue
View File

@@ -84,7 +84,6 @@
// 输入提现通证金额 // 输入提现通证金额
inputNum(e) { inputNum(e) {
let number = Number(e.detail.value) let number = Number(e.detail.value)
console.log(number, this.balance)
if (number <= Number(this.balance)) { if (number <= Number(this.balance)) {
this.total = Number(e.detail.value) * this.cost this.total = Number(e.detail.value) * this.cost
} else { } else {

4
pages/wallet/fragment.vue
View File

@@ -35,7 +35,7 @@
<view :class="['pay_type_item',cointype==='0'?'pay_type_item_select':'']" @click="selectCoinType('0')">已发放</view> <view :class="['pay_type_item',cointype==='0'?'pay_type_item_select':'']" @click="selectCoinType('0')">已发放</view>
</view> </view>
</view> </view>
<view class="record-title">当前积分个数</view> <view class="record-title">当前贡献值个数</view>
<view class="record-money">{{score || '0.00'}} <span>个</span></view> <view class="record-money">{{score || '0.00'}} <span>个</span></view>
</view> </view>
@@ -53,7 +53,7 @@
</view> </view>
</view> </view>
<!-- 无列表 --> <!-- 无列表 -->
<no-list v-if="lists.length === 0" name='no-record' txt="没有任何积分记录 ~ " /> <no-list v-if="lists.length === 0" name='no-record' txt="没有任何贡献值记录 ~ " />
<!-- <u-toast ref="uToast" /> --> <!-- <u-toast ref="uToast" /> -->
<u-toast ref="uToast" /> <u-toast ref="uToast" />

1
pages/wallet/property.vue
View File

@@ -140,7 +140,6 @@
success: (res) => { success: (res) => {
switch (res.tapIndex) { switch (res.tapIndex) {
case 0: case 0:
console.log('提现了，')
this.$Router.push({ this.$Router.push({
name: 'Extract' name: 'Extract'
}) })

3
pages/wallet/redProperty.vue
View File

@@ -58,11 +58,9 @@
this.reset() this.reset()
uni.setStorageSync('refresh',false) uni.setStorageSync('refresh',false)
}else{ }else{
console.log('没有更多更新')
} }
}, },
onReachBottom() { onReachBottom() {
console.log('chudi.....')
if(this.has_more){ if(this.has_more){
this.page = this.page+1 this.page = this.page+1
this.getlog() this.getlog()
@@ -80,7 +78,6 @@
page:this.page page:this.page
} }
accountCashs(data).then(res => { accountCashs(data).then(res => {
console.log(res)
this.logs = this.logs.concat(res.lists.data) this.logs = this.logs.concat(res.lists.data)
this.cash = res.cash this.cash = res.cash
this.has_more = res.lists.page.has_more this.has_more = res.lists.page.has_more

3
pages/wallet/withdrawList.vue
View File

@@ -25,7 +25,7 @@
</view> </view>
</view> </view>
<!-- <view class="record-title">积分个数</view> <!-- <view class="record-title">贡献值个数</view>
<view class="record-money"><span>￥</span>{{account || '0.00'}}</view> --> <view class="record-money"><span>￥</span>{{account || '0.00'}}</view> -->
</view> </view>
@@ -108,7 +108,6 @@
date: this.date, date: this.date,
} }
withdrawsIndexLists(data).then(res => { withdrawsIndexLists(data).then(res => {
console.log(res)
this.account = res.all this.account = res.all
this.lists = this.lists.concat(res.lists.data) this.lists = this.lists.concat(res.lists.data)
this.has_next_page = res.lists.page.has_more this.has_next_page = res.lists.page.has_more

52699
unpackage/dist/dev/app-plus/app-service.js vendored
View File

File diff suppressed because one or more lines are too long

2
unpackage/dist/dev/app-plus/manifest.json vendored
View File

File diff suppressed because one or more lines are too long