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

33
App.vue
View File

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

5
apis/interfaces/vip.js
View File

@@ -1,4 +1,3 @@
/**
* Web唐明明
* 匆匆数载恍如梦，岁月迢迢华发增。
@@ -6,7 +5,9 @@
* moduleName: 会员
*/
import { request } from '../index'
import {
request
} from '../index'
// 会员身份信息
const identities = () => {

2
apis/interfaces/withdraws.js
View File

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

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

@@ -1,4 +1,3 @@
<template>
<view class="goods--list">
<block v-if="list.length > 0">
@@ -6,8 +5,18 @@
<view class="cover">
<image class="cover--src" :src="item.cover" mode="aspectFill" />
</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="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="price eb" v-if="priceType === 'EB'">
{{item.price}}<text>易币</text>
@@ -37,6 +46,10 @@
export default {
name: 'goodsList',
props: {
notag: {
type: String,
default: ''
},
// 数据列表
list: {
type: Array,
@@ -68,6 +81,7 @@ export default {
padding: calc(#{$padding} - 10rpx);
display: flex;
flex-wrap: wrap;
.goods--item {
background: white;
box-sizing: border-box;
@@ -75,10 +89,26 @@ export default {
margin: 10rpx;
border-radius: $radius/2;
overflow: hidden;
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;
width: 100%;
padding-top: 100%;
.cover--src {
position: absolute;
height: 100%;
@@ -87,26 +117,41 @@ export default {
left: 0;
}
}
.content {
padding: $padding/2;
.title {
font-size: $title-size-lg;
line-height: 40rpx;
height: 80rpx;
text-align: justify;
@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 {
width: 100%;
display: flex;
justify-content: space-between;
padding-top: $padding/2;
.price {
width: 50%;
color: $text-price;
font-weight: bold;
font-size: $title-size;
@extend .nowrap;
text {
font-size: $title-size-sm;
font-weight: normal;
@@ -114,6 +159,7 @@ export default {
line-height: 50rpx;
}
}
.sales {
width: 50%;
font-size: $title-size-sm;
@@ -126,6 +172,7 @@ export default {
}
}
}
// 数据空
.goods--null {
width: 100%;

2
pages.json
View File

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

1
pages/company/approve.vue
View File

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

1
pages/coupons/add.vue
View File

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

1
pages/coupons/management.vue
View File

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

66
pages/equity/index.vue
View File

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

18
pages/found/index.vue
View File

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

1
pages/found/task.vue
View File

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

1
pages/goods/add.vue
View File

@@ -419,7 +419,6 @@
}
if(authRes.confirm){
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'}})
}
}

1
pages/goods/confirmOrder.vue
View File

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

124
pages/goods/details.vue
View File

@@ -15,7 +15,7 @@
<view class="header">
<view class="flex-box">
<view class="price"><text>￥</text>{{goodsObj.price.show}}</view>
<view class="sales">累计易货{{goodsObj.sales}}次</view>
<view class="sales">累计交易{{goodsObj.sales}}次</view>
</view>
<view class="coupon" v-if="couponSee.length > 0" @click="couponsOpne">
<view class="coupon-list" v-for="(item, index) in couponSee" :key="index">
@@ -23,9 +23,15 @@
{{item.title}}
</view>
</view>
<view class="coupon-btn">领券<image class="coupon-btn-img" src="../../static/icons/goods_row.png" mode="aspectFill"></image></view>
<view class="coupon-btn">领券<image class="coupon-btn-img" src="../../static/icons/goods_row.png"
mode="aspectFill"></image>
</view>
</view>
<view class="title">
<view class="title-hot" v-if="goodsObj.specal_tags.is_allow_values">{{goodsObj.specal_tags.is_allow_values}}</view>
<view class="title-hot" v-if="goodsObj.specal_tags.is_self">{{goodsObj.specal_tags.is_self}}</view>
{{goodsObj.name}}
</view>
<view class="title"><view class="title-hot">热卖</view>{{goodsObj.name}}</view>
<!-- <view class="sub-title">{{goodsObj.description}}</view> -->
</view>
<!-- 商家信息 -->
@@ -34,28 +40,31 @@
<view class="store-cont">
<view class="store-title">{{goodsObj.shop.name}}</view>
<view class="rate">
<uni-rate
:readonly="true"
color="#ddd"
active-color="#c82626"
:value="goodsObj.company.star"
:size="14"
/>
<uni-rate :readonly="true" color="#ddd" active-color="#c82626" :value="goodsObj.company.star"
:size="14" />
</view>
<view class="openbtn" @click="onOpenWechat">进店<image class="openbtn-img"
src="../../static/icons/equity_arrow_right.png" mode="aspectFill"></image>
</view>
<view class="openbtn" @click="onOpenWechat">进店<image class="openbtn-img" src="../../static/icons/equity_arrow_right.png" mode="aspectFill"></image></view>
</view>
<view class="tooSee">
<view class="tooSee-label" @click="$Router.push({name: 'GoodsChain', params: {id: goodsObj.goods_id}})">
<view class="tooSee-label"
@click="$Router.push({name: 'GoodsChain', params: {id: goodsObj.goods_id}})">
区块链证书
<image class="tooSee-label-img" src="../../static/icons/equity_arrow_right.png" mode="aspectFill"></image>
<image class="tooSee-label-img" src="../../static/icons/equity_arrow_right.png"
mode="aspectFill"></image>
</view>
<view class="tooSee-label" @click="$Router.push({name: 'GoodsAttestation', params: {id: goodsObj.goods_id}})">
<view class="tooSee-label"
@click="$Router.push({name: 'GoodsAttestation', params: {id: goodsObj.goods_id}})">
商品认证
<image class="tooSee-label-img" src="../../static/icons/equity_arrow_right.png" mode="aspectFill"></image>
<image class="tooSee-label-img" src="../../static/icons/equity_arrow_right.png"
mode="aspectFill"></image>
</view>
<view class="tooSee-label" @click="$Router.push({name: 'GoodstracedTo', params: {id: goodsObj.goods_id}})">
<view class="tooSee-label"
@click="$Router.push({name: 'GoodstracedTo', params: {id: goodsObj.goods_id}})">
商品溯源
<image class="tooSee-label-img" src="../../static/icons/equity_arrow_right.png" mode="aspectFill"></image>
<image class="tooSee-label-img" src="../../static/icons/equity_arrow_right.png"
mode="aspectFill"></image>
</view>
</view>
</view>
@@ -73,8 +82,10 @@
<label class="title">服务</label>
<view class="goods-serve" @click="serveOpne">
<image class="goods-serve-img" src="../../static/icons/goods_buy.png" mode="aspectFill"></image>
<view class="nowrap goods-serve-name"><text v-for="(item, index) in goodsObj.services">{{item.name}}</text></view>
<image class="goods-serve-img" src="../../static/icons/goods_spot.png" mode="aspectFill"></image>
<view class="nowrap goods-serve-name"><text
v-for="(item, index) in goodsObj.services">{{item.name}}</text></view>
<image class="goods-serve-img" src="../../static/icons/goods_spot.png" mode="aspectFill">
</image>
</view>
</view>
</view>
@@ -173,7 +184,10 @@
</template>
<script>
import { goods, managesCoupons } from '@/apis/interfaces/goods'
import {
goods,
managesCoupons
} from '@/apis/interfaces/goods'
import userAuth from '@/public/userAuth'
export default {
data() {
@@ -295,6 +309,7 @@
padding-top: 100%;
}
// 轮播图
.goods-covers {
position: fixed;
@@ -303,18 +318,21 @@
z-index: 1;
width: 100%;
padding-top: 100%;
.swiper {
position: absolute;
top: 0;
left: 0;
width: 100%;
height: 100%;
.swiper-item {
width: 100%;
height: 100%;
}
}
}
// 商品详情
.goods-content {
position: relative;
@@ -323,16 +341,19 @@
border-radius: $radius $radius 0 0;
padding-bottom: calc((#{$padding} * 2) + (env(safe-area-inset-bottom) / 2) + 90rpx);
padding-bottom: calc((#{$padding} * 2) + (constant(safe-area-inset-bottom) / 2) + 90rpx);
// 详情
.header {
padding: 0 $padding $padding;
.title {
font-size: $title-size;
font-weight: bold;
line-height: 50rpx;
.title-hot {
display: inline-block;
background-color: #fee195;
background-image: linear-gradient(to left,#fee195,#fee195);
font-size: 24rpx;
border-radius: 50rpx;
padding: 0 10rpx;
@@ -341,25 +362,31 @@
margin: 6rpx 10rpx 0 0;
}
}
.sub-title {
line-height: 40rpx;
font-size: $title-size-sm;
color: $text-gray;
padding-bottom: $padding/3;
}
.flex-box {
display: flex;
justify-content: space-between;
line-height: 90rpx;
.price {
font-weight: bold;
color: $text-price;
font-size: $title-size + 14;
text {
font-size: 70%;
}
width: calc(60% - #{$padding});
}
.sales {
font-size: $title-size-sm;
color: $text-gray;
@@ -379,8 +406,10 @@
display: flex;
position: relative;
margin-bottom: $margin - 10;
.coupon-list {
font-size: 22rpx;
.coupon-label {
display: inline-block;
border: 1rpx solid #e998a1;
@@ -391,6 +420,7 @@
margin-right: $margin - 10;
}
}
.coupon-btn {
position: absolute;
right: $padding - 20;
@@ -399,6 +429,7 @@
font-size: 24rpx;
display: flex;
font-weight: 700;
.coupon-btn-img {
width: 22rpx;
height: 22rpx;
@@ -411,17 +442,21 @@
// 新增服务
.goods-serve {
display: flex;
.goods-serve-img {
width: 36rpx;
height: 36rpx;
margin-top: 26rpx;
}
.goods-serve-name {
margin: 0 30rpx 0 20rpx;
width: calc(100% - 122rpx);
text {
padding-right: $padding;
position: relative;
&:last-child {
padding-right: 0;
}
@@ -437,6 +472,7 @@
border-radius: $radius/2;
padding: $padding;
min-height: 220rpx;
.logo {
position: absolute;
left: $margin;
@@ -445,6 +481,7 @@
height: 98rpx;
border-radius: $radius/2;
}
.store-cont {
position: absolute;
width: 100%;
@@ -455,6 +492,7 @@
box-sizing: border-box;
height: 140rpx;
}
.tooSee {
position: absolute;
top: 150rpx;
@@ -462,6 +500,7 @@
font-size: 24rpx;
padding-left: $padding;
box-sizing: border-box;
.tooSee-label {
background-color: #fd683e;
border-radius: 8rpx 4rpx 4rpx 6rpx;
@@ -473,10 +512,13 @@
display: inline-block;
margin-right: $margin * 2;
position: relative;
&::after, &::before{
&::after,
&::before {
content: '';
position: absolute;
}
&::after {
right: -40rpx;
top: 0;
@@ -485,6 +527,7 @@
height: 100%;
border-radius: 4rpx 8rpx 8rpx 4rpx;
}
&::before {
right: -1rpx;
top: 5%;
@@ -493,19 +536,24 @@
z-index: 2;
box-sizing: border-box;
}
&:last-child {
margin: 0;
}
&:first-child {
background-color: #f2d7aa;
color: #362507;
}
&:first-child::after {
background-color: #f1d599;
}
&:first-child::before {
border-color: #fae2b9;
}
.tooSee-label-img {
position: absolute;
right: -34rpx;
@@ -514,11 +562,13 @@
height: 28rpx;
z-index: 9;
}
&:first-child .tooSee-label-img {
filter: brightness(.2)
}
}
}
.store-title {
font-size: $title-size-lg;
font-weight: bold;
@@ -526,6 +576,7 @@
color: $text-color;
margin-bottom: 10rpx;
}
// rate
.openbtn {
position: absolute;
@@ -538,6 +589,7 @@
font-size: $title-size-m;
margin-top: -30rpx;
display: flex;
.openbtn-img {
width: 32rpx;
height: 32rpx;
@@ -546,16 +598,19 @@
}
}
}
// 产品规格
.size {
margin-top: $margin;
border-top: solid 20rpx #F8F8F8;
border-bottom: solid 20rpx #F8F8F8;
.size-item {
position: relative;
padding: 0 $padding 0 ($padding + 100);
line-height: 90rpx;
font-size: $title-size-m;
&::after {
position: absolute;
left: $margin;
@@ -565,9 +620,11 @@
height: 1rpx;
background-color: $border-color;
}
&:last-child::after {
display: none;
}
.title {
position: absolute;
left: $margin;
@@ -576,6 +633,7 @@
}
}
}
// 产品详情
.product {
image {
@@ -584,6 +642,7 @@
}
}
}
// 立即购买
.footer {
padding: $padding;
@@ -594,6 +653,7 @@
width: 100%;
z-index: 99;
box-sizing: border-box;
.btn[size='default'] {
width: 100%;
height: 90rpx;
@@ -616,13 +676,16 @@
border-radius: 40rpx 40rpx 0 0;
padding: $padding;
box-sizing: border-box;
.coupons-header {
text-align: center;
position: relative;
margin-bottom: $margin*1.5;
.title {
font-weight: 700;
}
.close {
position: absolute;
right: 0;
@@ -632,17 +695,20 @@
height: 38rpx;
}
}
.coupons-cont {
.coupons-name {
color: #616065;
font-size: 30rpx;
}
.coupons-list {
border: 2rpx solid #d6b9be;
border-radius: 10rpx;
overflow: hidden;
position: relative;
margin-top: $margin;
// background-color: red;
.coupons-tips {
// background-color: #211e17;
@@ -656,12 +722,14 @@
left: 0;
top: 0;
z-index: 10;
.coupons-tips-text {
font-size: 24rpx;
transform: scale(.85);
display: block;
}
}
.coupons-left {
background-color: #fdedee;
color: #e1293f;
@@ -669,26 +737,32 @@
text-align: center;
padding: $padding - 10 0;
border-right: 2rpx dashed #eccdd4;
.coupon-left-img {
width: 180rpx;
height: 100rpx;
border-radius: 20rpx;
}
.coupons-number {
font-size: 40rpx;
font-weight: 600;
text {
font-size: 24rpx;
}
&.coupons-small {
font-size: 32rpx;
padding: 20rpx 0;
}
}
.coupons-full {
font-size: 24rpx;
}
}
.coupons-center {
position: absolute;
width: 100%;
@@ -697,12 +771,14 @@
padding: $padding - 10 130rpx 0 220rpx;
box-sizing: border-box;
font-size: 28rpx;
.coupons-time {
font-size: 24rpx;
margin-top: 10rpx;
color: #514c51;
}
}
.coupons-right {
position: absolute;
right: 20rpx;
@@ -714,6 +790,7 @@
border-radius: 80rpx;
font-size: 24rpx;
line-height: 52rpx;
&.coupons-right-active {
background-color: #adadad;
color: #FFFFFF;
@@ -721,6 +798,7 @@
}
}
}
.coupons-true {
background-image: linear-gradient(to right, #e1293f, #fd275d);
color: #FFFFFF;
@@ -735,10 +813,12 @@
.serve-label {
margin-top: $margin + 10;
font-size: 28rpx;
.serve-label-name {
font-weight: 700;
margin-bottom: $margin - 10;
}
.serve-label-text {
line-height: 44rpx;
}

1
pages/goods/goodsAuth.vue
View File

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

18
pages/goods/lists.vue
View File

@@ -1,5 +1,6 @@
<template>
<view class="Goods-LISTS">
<!-- <image :src="`${config.apiUrls}images/baodan-banner.png`" mode="widthFix" /> -->
<view class="tabs">
<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">
@@ -19,6 +20,9 @@
list
} from '@/apis/interfaces/goods'
import goodsList from '@/components/goods-list/goods-list'
import {
config
} from '@/apis/index.js'
export default {
name: 'Goods-LISTS',
data() {
@@ -28,6 +32,7 @@
goods: [],
page: 1,
has_more: true,
isBaoDan: false, // 是否是报单，默认有id不是报单，无id是报单
};
},
onReachBottom() {
@@ -44,6 +49,14 @@
created() {
this.getList()
},
onShow() {
if (this.$Route.query.type === 'baodan') {
this.isBaoDan = true
uni.setNavigationBarTitle({
title: '报单商品'
})
}
},
methods: {
onTabs(e) {
let index = e.target.dataset.index
@@ -72,8 +85,11 @@
order_by: this.tabIndex == 1 ? this.marketType : '',
page: this.page
}
if (this.$Route.query.type) {
if (this.$Route.query.type === 'id') {
data.category_id = this.$Route.query.id
} else if (this.$Route.query.type === 'baodan') {
// 报单加个条件筛选
data.is_allow_values = 1
} else {
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>
<!-- 优选商品 -->
<goodsList :list="goods" priceType="CNY" :status='status' toast="暂无产品权证">
<goodsList :list="goods" priceType="CNY" :status='status' toast="暂无产品权证" notag='has'>
<template v-slot:statistics="goods">
<view>库存{{goods.value.stock}}</view>
</template>
@@ -127,7 +127,6 @@
cancelText : '确定',
success : res => {
if(res.confirm){
console.log(res.confirm)
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 : '查看通证'}}
</view>
<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>
@@ -58,7 +58,7 @@
<image :src="item.cover" />
</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>
</scroll-view>
<!-- 平台概况 -->
@@ -86,7 +86,7 @@
<view class="number nowrap">{{chains.up}}</view>
</view>
<view class="header-item">
<view class="title">昨日瓜分积分
<view class="title">昨日瓜分贡献值
<uni-icons class="help-icon" @click="showHelp('score')" type="help-filled" size="15"
color="rgba(255,255,255,.3)" />
</view>
@@ -174,9 +174,6 @@
},
// 查看钱包账户
navAccount(pathName) {
console.log(1111)
if (!this.isAuth) {
this.$Router.push({
name: 'Login'
@@ -217,7 +214,6 @@
success: res => {
if (res.confirm) {
if (pathName === 'vipIndex') {
console.log(this.userAuth.identity)
this.$Router.push({
name: 'vipIndex',
params: {
@@ -234,7 +230,7 @@
}
})
},
// 领取积分
// 领取贡献值
ledCrystal(index) {
// 播放音频
const innerAudioContext = uni.createInnerAudioContext();

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

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

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

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

2
pages/user/code.vue
View File

@@ -34,7 +34,7 @@
</swiper>
</view>
<view class="footer">
<view class="hith">朋友通过你的邀请注册成功后，将与您绑定好友关系通过成为平台用户，你都可以获得积分奖励。</view>
<view class="hith">朋友通过你的邀请注册成功后，将与您绑定好友关系通过成为平台用户，你都可以获得贡献值奖励。</view>
<view class="number">
<view class="title">邀请码 : {{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>
<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"
src="/static/user/userAssets_tips.png" />
</view>
@@ -391,9 +391,6 @@
userInfo() {
// 读取配置信息
userIndex().then(res => {
console.log(res)
res.account = {
stone: res.stone,
stone_value: res.stone_value,
@@ -455,7 +452,7 @@
showHelp(type) {
let title = '通证',
content = this.helpDoc.energy_ball.description
if (type == 'chip') title = '积分'
if (type == 'chip') title = '贡献值'
if (type == 'chip') content = this.helpDoc.energy_shard.description
uni.showModal({
title: title,

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

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

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

@@ -36,7 +36,9 @@
import {
MallRefundsTemplate
} from '@/components/mall-refunds-template/mall-refunds-template'
import { mallRefunds } from '@/apis/interfaces/numberWeight'
import {
mallRefunds
} from '@/apis/interfaces/numberWeight'
export default {
components: {
MallRefundsTemplate
@@ -76,7 +78,6 @@
this.getList()
},
onShow() {
console.log(uni.getStorageSync('refresh'),'getStorageSync')
if (uni.getStorageSync('refresh')) {
this.reset()
}
@@ -91,7 +92,8 @@
} else {
this.$refs.uToast.show({
title: '吼吼吼~我是有底的~',
type: 'error',icon:false,
type: 'error',
icon: false,
duration: 3000
})
}
@@ -119,31 +121,30 @@
state: this.selectNavId
}
mallRefunds(data).then(res => {
console.log(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,
type: 'error',
icon: false,
duration: 3000
})
})
},
// 取消提货单
nowCancel(index, no) {
console.log(index,no)
uni.showModal({
title: '哎呦，提醒你',
content: '是否确认要取消订单啊，取消后请去我的权证中查看',
success: (res) => {
if (res.confirm) {
mallShipmentsCancel(no).then(res => {
console.log(res)
this.$refs.uToast.show({
title: res,
type: 'error',icon:false,
type: 'error',
icon: false,
duration: 3000
})
this.lists.splice(index, 1)
@@ -151,14 +152,16 @@
}).catch(err => {
this.$refs.uToast.show({
title: err.message,
type: 'error',icon:false,
type: 'error',
icon: false,
duration: 3000
})
})
} else if (res.cancel) {
this.$refs.uToast.show({
title: '放弃了~',
type: 'error',icon:false,
type: 'error',
icon: false,
duration: 3000
})
}
@@ -168,18 +171,16 @@
},
// 签收提货单
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({
title: res,
type: 'error',icon:false,
type: 'error',
icon: false,
duration: 3000
})
this.lists.splice(index, 1)
@@ -187,7 +188,8 @@
}).catch(err => {
this.$refs.uToast.show({
title: err.message,
type: 'error',icon:false,
type: 'error',
icon: false,
duration: 3000
})
})
@@ -195,7 +197,8 @@
} else if (res.cancel) {
this.$refs.uToast.show({
title: '放弃了~',
type: 'error',icon:false,
type: 'error',
icon: false,
duration: 3000
})
}
@@ -279,6 +282,7 @@
font-size: 28rpx;
color: #fff;
border-top: solid 1rpx #EFF4F2;
.nowPay {
padding: 4rpx 20rpx;
border-radius: 40rpx;

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

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

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

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

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

@@ -46,14 +46,12 @@
</navigator>
<view class="goods-type">创建提货单时间 <span>{{info.created_at}}</span></view>
<view class="goods-type" v-if="type === '1'">运费 <span>免邮</span></view>
<view class="goods-type">提货数量 <span><u-number-box v-model="info.qty" :disabled="true"></u-number-box></span></view>
<view class="goods-type">提货数量 <span>
<u-number-box v-model="info.qty" :disabled="true"></u-number-box>
</span></view>
<view class="goods-type">提货方式
<u-radio-group v-model="type">
<u-radio
v-for="(item, index) in list" :key="index"
:name="item.id"
:disabled="type !== item.id"
>
<u-radio v-for="(item, index) in list" :key="index" :name="item.id" :disabled="type !== item.id">
{{item.name}}
</u-radio>
</u-radio-group>
@@ -65,12 +63,15 @@
提货门店
<view class="goods-type-address">
<view class="list-top1">
<image :src="info.store.cover.showpath" @click="map(info.store)" mode="aspectFill" class="list-top1-img" />
<image :src="info.store.cover.showpath" @click="map(info.store)" mode="aspectFill"
class="list-top1-img" />
<view class="shop-info shop-info1">
<view class="title ellipsis">{{info.store.name}}</view>
<view class="des" style="padding-top: 16rpx;">营业时间：{{info.store.start_time}}</view>
<view class="des" style="padding-top: 4rpx;" @click="call(info.store.mobile)">联系电话：{{info.store.mobile}}</view>
<view class="des" style="padding-top: 4rpx;" @click="map(info.store)">门店地址：{{info.store.address}}</view>
<view class="des" style="padding-top: 4rpx;" @click="call(info.store.mobile)">
联系电话：{{info.store.mobile}}</view>
<view class="des" style="padding-top: 4rpx;" @click="map(info.store)">
门店地址：{{info.store.address}}</view>
</view>
</view>
</view>
@@ -89,15 +90,26 @@
</template>
<script>
import { mallShipmentsInfo,mallShipmentsCancel,mallShipmentsSign } from '@/apis/interfaces/numberWeight'
import {
mallShipmentsInfo,
mallShipmentsCancel,
mallShipmentsSign
} from '@/apis/interfaces/numberWeight'
export default {
name: 'OrderInfo',
data() {
return {
info: {},
list: [
{ name: '快递', disabled: true , id:'1'},
{ name: '自提', disabled: false , id:'2'}
list: [{
name: '快递',
disabled: true,
id: '1'
},
{
name: '自提',
disabled: false,
id: '2'
}
],
address: {},
type: '1', //提货类型：2 自提 1 邮寄
@@ -128,7 +140,8 @@
}).catch(err => {
this.$refs.uToast.show({
title: err.message,
type: 'error',icon:false,
type: 'error',
icon: false,
duration: 3000
})
})
@@ -141,24 +154,26 @@
success: (res) => {
if (res.confirm) {
mallShipmentsCancel(no).then(res => {
console.log(res)
this.$refs.uToast.show({
title: res,
type: 'error',icon:false,
type: 'error',
icon: false,
duration: 3000
})
this.getInfo(no)
}).catch(err => {
this.$refs.uToast.show({
title: err.message,
type: 'error',icon:false,
type: 'error',
icon: false,
duration: 3000
})
})
} else if (res.cancel) {
this.$refs.uToast.show({
title: '放弃了~',
type: 'error',icon:false,
type: 'error',
icon: false,
duration: 3000
})
}
@@ -167,18 +182,16 @@
},
// 签收提货单
nowSign(no) {
console.log(no)
uni.showModal({
title: '哎呦，提醒你',
content: '是否确认已经收到商品了呀',
success: (res) => {
if (res.confirm) {
console.log(no)
mallShipmentsSign(no).then(res => {
console.log(res)
this.$refs.uToast.show({
title: res,
type: 'error',icon:false,
type: 'error',
icon: false,
duration: 3000
})
this.getInfo(no)
@@ -186,7 +199,8 @@
}).catch(err => {
this.$refs.uToast.show({
title: err.message,
type: 'error',icon:false,
type: 'error',
icon: false,
duration: 3000
})
})
@@ -194,7 +208,8 @@
} else if (res.cancel) {
this.$refs.uToast.show({
title: '放弃了~',
type: 'error',icon:false,
type: 'error',
icon: false,
duration: 3000
})
}
@@ -203,7 +218,6 @@
},
// 查看提货二维码 弹窗
takeCode() {
console.log(this.info.code)
let url = this.info.code,
urls = [this.info.code]
uni.previewImage({
@@ -226,13 +240,10 @@
})
},
map(info) {
console.log(info.latitude,info.longitude)
uni.openLocation({
latitude: Number(info.latitude),
longitude: Number(info.longitude),
success: function () {
console.log('success');
}
success: function() {}
});
}
@@ -327,6 +338,7 @@
padding: 30rpx 0;
border-bottom: solid 1rpx #f7f7f7;
}
.goods-type-1 {
display: flex;
flex-direction: column;
@@ -336,12 +348,14 @@
padding: 30rpx 0;
border-bottom: solid 1rpx #f7f7f7;
}
.goods-type-address {
display: flex;
flex-direction: row;
align-items: center;
justify-content: center;
box-sizing: border-box;
u-icon {
padding-left: 20rpx;
}
@@ -468,6 +482,7 @@
border-radius: 10rpx;
}
}
// 操作信息
.actions {
display: flex;
@@ -481,6 +496,7 @@
font-size: 28rpx;
padding: 20rpx 50rpx 30rpx 50rpx;
color: #fff;
.nowPay {
padding: 4rpx 20rpx;
border-radius: 40rpx;
@@ -525,6 +541,7 @@
}
}
.flexrow {
display: flex;
flex-direction: row;
@@ -532,6 +549,7 @@
justify-content: space-between;
box-sizing: border-box;
width: 100%;
.copy {
color: $main-color;
font-size: $title-size*0.8;
@@ -539,6 +557,7 @@
padding: 0 30rpx;
}
}
.no-address {
display: flex;
flex-direction: row;
@@ -546,6 +565,7 @@
justify-content: center;
box-sizing: border-box;
}
// 优惠券弹窗
.scrollView {
// padding: 40rpx;
@@ -582,6 +602,7 @@
}
}
}
.list-top1 {
display: flex;
flex-direction: row;
@@ -592,21 +613,26 @@
width: 100%;
margin-left: 0 !important;
margin-top: 30rpx;
.shop-info {
margin-left: 20rpx;
}
.list-top1-img {
width: 170rpx;
height: 170rpx;
border-radius: 10rpx;
}
.des {
font-size: 28rpx;
}
.title {
font-size: 32rpx;
}
}
.list-top {
display: flex;
flex-direction: row;
@@ -618,15 +644,18 @@
border-bottom: solid 1rpx #f7f7f7;
width: 600rpx;
margin-left: 30rpx;
.list-top-left {
display: flex;
flex-direction: row;
align-items: center;
justify-content: flex-start;
box-sizing: border-box;
.shop-info {
flex: 1;
}
.title {
width: 380rpx;
font-size: $title-size*1;
@@ -665,5 +694,4 @@
border-radius: 4rpx;
}
}
</style>

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

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

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

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

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

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

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

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

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

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

3
pages/verification/history.vue
View File

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

8
pages/verification/index.vue
View File

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

1
pages/vip/examine.vue
View File

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

27
pages/vip/vip.vue
View File

@@ -98,7 +98,8 @@
<block v-else>
<view class="privilege-label" v-if="openCondition.certification"
:class="{ active: openCondition.certification.finish }">
{{ openCondition.certification.message }}</view>
{{ openCondition.certification.message }}
</view>
</block>
</view>
</view>
@@ -128,7 +129,8 @@
:src="identitie[tabsIndex].button_cover" mode="widthFix" @click="openOrder" />
<view class="current-btn-sh" v-if="identitie[tabsIndex].can.show_button && voucher !== ''"
@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="ios-bottom"></view>
</view>
@@ -136,10 +138,23 @@
</template>
<script>
import { identities, vipOrder, 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 {
identities,
vipOrder,
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'
export default {
data() {

4
pages/wallet/addBank.vue
View File

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

3
pages/wallet/bankList.vue
View File

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

1
pages/wallet/extractRed.vue
View File

@@ -84,7 +84,6 @@
// 输入提现通证金额
inputNum(e) {
let number = Number(e.detail.value)
console.log(number, this.balance)
if (number <= Number(this.balance)) {
this.total = Number(e.detail.value) * this.cost
} 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>
</view>
<view class="record-title">当前积分个数</view>
<view class="record-title">当前贡献值个数</view>
<view class="record-money">{{score || '0.00'}} <span>个</span></view>
</view>
@@ -53,7 +53,7 @@
</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" />

1
pages/wallet/property.vue
View File

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

3
pages/wallet/redProperty.vue
View File

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

3
pages/wallet/withdrawList.vue
View File

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

49417
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