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

解决冲突

Browse Source
This commit is contained in:
张冬雪
2021-11-03 18:43:00 +08:00
parent 1df114459c 72a3d53a17
commit 87b8fe22d0
52 changed files with 49016 additions and 541 deletions
Download Patch File Download Diff File Expand all files Collapse all files

397
pages/equity/index.vue
View File

@@ -1,120 +1,25 @@
<template>
<view>
<!-- 状态栏 -->
<nv :config="nvConfig" @nvTabTap="onNvTab" @nvBtnTap="onRightBtn" />
<block v-if="tabIndex === 1">
<!-- 推荐商家 -->
<view class="block-title">
<view class="title">
推荐商家
</view>
<view class="header-back">
<!-- 轮播图 -->
<view class="banner">
<swiper class="banner-swiper" indicator-color="#8b64fd" 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" @click="swiperClick(item.url)" />
</swiper-item>
</swiper>
</view>
<scroll-view scroll-x class="recommended">
<block v-for="(item, index) in recommendBus" :key="index">
<view class="item-box">
<image class="item-cover" :src="item.cover" mode="aspectFill" />
<view class="item-vip">
<view class="item-vip-text">{{item.level.name}}</view>
<view class="item-vip-tips">企业</view>
</view>
<view class="item-title nowrap">{{item.name || '-'}}</view>
<view class="item-trade nowrap">行业：{{item.industry.title}}</view>
<view class="item-bar">
<view class="item-bar-color">
<view class="item-bar-strip" :style="{width: item.process + '%'}">
<text class="item-bar-per">{{item.process}}%</text>
</view>
</view>
<image class="item-bar-strip-img" src="../../static/icons/equity_arrow_up.png"
mode="aspectFill"></image>
</view>
<view class="item-url">
<view class="item-credit">
<image class="item-credit-img" src="../../static/icons/equity_arrow_icon.png"
mode="aspectFill"></image>信用值 {{item.integrity}}
</view>
<view class="item-btn" @click="onOpenWechat(item)">进店<image
src="../../static/icons/equity_arrow_right.png" mode="aspectFill"></image>
</view>
</view>
</view>
</block>
</scroll-view>
<!-- 热易商家 -->
<view class="block-title">
<view class="title">
热易商家
<!-- 分类 -->
<view class="classify">
<view class="classify-item" v-for="(item, index) in classify" :key="index"
@click="onClassify(item.category_id)">
<image class="cover" :src="item.cover" mode="aspectFill"></image>
<view class="title">{{item.name}}</view>
</view>
</view>
<swiper class="hot-swiper">
<swiper-item v-for="(item, index) in hotBus" :key="index">
<view class="hot-box" @click="onOpenWechat(item)">
<image class="cover" :src="item.cover" mode="aspectFill" />
<view class="hot-vip">{{item.level.name}}</view>
<view class="hot-content">
<view class="hot-title nowrap">{{item.name || '-'}}</view>
<view class="hot-credit">信誉值 {{item.integrity}}</view>
<view class="hot-trade nowrap">所属行业：{{item.industry.title}}</view>
<view class="hot-warrant">
<view class="hot-warrant-text nowrap">
权证数量：{{item.goodsCount}}
</view>
<view class="hot-bar">
<view class="hot-bar-color">
<view class="hot-bar-strip" :style="{width: item.process + '%'}"></view>
</view>
<view class="hot-bar-per">{{item.process}}</view>
</view>
</view>
<!-- <view class="credibility">
<uni-rate
:readonly="true"
color="#ddd"
active-color="#e93340"
:value="item.star"
:size="14"
/>
</view>
<view class="trading nowrap">累计交易次</view> -->
</view>
<view class="hot-tool">
<view class="hot-deal">
交易量<text class="hot-deal-number">{{item.saleCount || 0}}次</text>
</view>
</view>
</view>
</swiper-item>
</swiper>
<v-tabs v-model="industryIndex" :tabs="industryBus" color="#555555" activeColor="#e93340" fontSize="30rpx"
height="80rpx" lineHeight="6rpx" lineColor="#e93340" bgColor="#f5f5f5" @change="onBusIndustry"></v-tabs>
<!-- 商家 -->
<industry-list :list="busList" @on-industry="onOpenWechat" />
<!-- 分页 -->
<uni-load-more v-if="busList.length > 0" :status="pageStatus" :iconSize="16"></uni-load-more>
</block>
<!-- 易货商城 -->
<block v-if="tabIndex === 0">
<view class="header-back">
<!-- 轮播图 -->
<view class="banner">
<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" @click="swiperClick(item.url)" />
</swiper-item>
</swiper>
</view>
<!-- 分类 -->
<view class="classify">
<view class="classify-item" v-for="(item, index) in classify" :key="index"
@click="onClassify(item.category_id)">
<image class="cover" :src="item.cover" mode="aspectFill"></image>
<view class="title">{{item.name}}</view>
</view>
<view class="classify-item" @click="onClassify('')">
<image class="cover" src="../../static/icons/equity_nav.png" mode="aspectFill"></image>
<view class="title">查看全部</view>
</view>
<view class="classify-item" @click="onClassify('')">
<image class="cover" src="../../static/icons/equity_nav.png" mode="aspectFill"></image>
<view class="title">查看全部</view>
</view>
</view>
<!-- 每日推荐 -->
@@ -147,69 +52,68 @@
<view class="price"><text>¥</text>{{item.original_price}}</view>
</view>
</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="block-title">
<view class="title">
限时抢购<text>海量商家优惠券</text>
<view class="itme">
<view class="itme-list" v-for="(item, index) in position.two" :key="index" @click="onGoods(item)">
<image class="cover" :src="item.cover" mode="aspectFill"></image>
<view class="title">{{item.name}}</view>
<view class="price"><text>¥</text>{{item.original_price}}</view>
</view>
<view class="more" @click="onCoupons('more')">查看更多</view>
</view> -->
<view class="coupons" v-if="coupons.length < 0">
<view class="coupons-item" v-for="(item, index) in coupons" :key="index">
<view class="content">
<view class="coupons-title">
<view class="coupons-title-tips" v-if="item.type">
<!-- value == 1服务券 value == 2代金券 value == 3提货券 -->
<image v-if="item.type.value == '1'" class="coupons-title-icon"
src="../../static/icons/equity_coupons_01.png" mode="aspectFill"></image>
<image v-else-if="item.type.value == '2'" class="coupons-title-icon"
src="../../static/icons/equity_coupons_02.png" mode="aspectFill"></image>
<image v-else-if="item.type.value == '3'" class="coupons-title-icon"
src="../../static/icons/equity_coupons_03.png" mode="aspectFill"></image>
</view>
<view class="coupons-title-name">
{{item.title}}
</view>
</view>
</view>
<!-- 优惠券 -->
<!-- <view class="block-title">
<view class="title">
限时抢购<text>海量商家优惠券</text>
</view>
<view class="more" @click="onCoupons('more')">查看更多</view>
</view> -->
<view class="coupons" v-if="coupons.length < 0">
<view class="coupons-item" v-for="(item, index) in coupons" :key="index">
<view class="content">
<view class="coupons-title">
<view class="coupons-title-tips" v-if="item.type">
<!-- value == 1服务券 value == 2代金券 value == 3提货券 -->
<image v-if="item.type.value == '1'" class="coupons-title-icon"
src="../../static/icons/equity_coupons_01.png" mode="aspectFill"></image>
<image v-else-if="item.type.value == '2'" class="coupons-title-icon"
src="../../static/icons/equity_coupons_02.png" mode="aspectFill"></image>
<image v-else-if="item.type.value == '3'" class="coupons-title-icon"
src="../../static/icons/equity_coupons_03.png" mode="aspectFill"></image>
</view>
<view class="coupons-title-name">
{{item.title}}
</view>
<view class="sun-text">{{item.title}}</view>
</view>
<view class="logo">
<image class="logo-img" :src="item.cover" mode="aspectFill"></image>
</view>
<button class="btn" :disabled="!item.can.get"
@click="onCoupons('get', item.coupon_id, index)">{{item.can.get ? '立即领取' : '已领取'}}</button>
<view class="sun-text">{{item.title}}</view>
</view>
</view>
<view class="block-title">
<view class="title">
优选商品<text>海量商家商品优选</text>
<view class="logo">
<image class="logo-img" :src="item.cover" mode="aspectFill"></image>
</view>
<button class="btn" :disabled="!item.can.get"
@click="onCoupons('get', item.coupon_id, index)">{{item.can.get ? '立即领取' : '已领取'}}</button>
</view>
<!-- 优选商品 -->
<goods-list :list="goods" priceType="CNY" @on-goods="onGoods" />
<!-- 分页 -->
<uni-load-more :status="pageStatus" :iconSize="16"></uni-load-more>
</block>
</view>
<view class="block-title">
<view class="title">
优选商品<text>海量商家商品优选</text>
</view>
</view>
<!-- 优选商品 -->
<goods-list :list="goods" priceType="CNY" @on-goods="onGoods" />
<!-- 分页 -->
<uni-load-more :status="pageStatus" :iconSize="16"></uni-load-more>
</view>
</template>
<script>
import {
companies,
companiesList
} from '@/apis/interfaces/company'
import {
mall,
list,
managesCoupons
} from '@/apis/interfaces/goods'
import { mall, list, managesCoupons } from '@/apis/interfaces/goods'
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'
import { config } from '@/apis/index.js'
export default {
comments: {
goodsList,
@@ -217,24 +121,6 @@
},
data() {
return {
tabIndex: 0,
nvConfig: {
tabArr: [{
title: '通证商城 - 买你想买',
active: true
},
// {
// title: '企业广场'
// }
],
color: '#FFF',
hideback: true,
bgColor: 'rgb(151, 109, 255)',
btn: [{
icon: '/static/icons/search-icon.png',
style: 'paddingRight: 20rpx;'
}]
},
// 易货部分
banners: [],
classify: [],
@@ -242,13 +128,6 @@
position: {},
goods: [],
goodsPage: 1,
// 广场部分
industryIndex: 0,
recommendBus: [],
hotBus: [],
industryBus: [],
busList: [],
busPage: 1,
// 分页
pageStatus: '',
imgUrl: config.apiUrls
@@ -257,33 +136,12 @@
created() {
this.getMall()
},
onNavigationBarButtonTap() {
this.$Router.push({
name: 'Search'
})
},
methods: {
// tab
onNvTab(e) {
let tabIndex = e.index
for (let i in this.nvConfig.tabArr) {
if (i == tabIndex) this.nvConfig.tabArr[i].active = true
else this.nvConfig.tabArr[i].active = false
}
this.tabIndex = tabIndex
if (tabIndex == 1 && this.recommendBus.length <= 0) this.getCompanies()
},
// 搜索
onRightBtn(e) {
switch (e.index) {
case 0:
// this.$Router.push({
// name: 'Search',
// query: {
// type: this.tabIndex
// }
// })
uni.navigateTo({
url: '/pages/equity/search?type=' + this.tabIndex + ''
})
break
}
},
// 点击轮播图
swiperClick(url) {
if (url === 'goBaoDanList') {
@@ -292,73 +150,6 @@
})
}
},
// 领取，更多优惠券
onCoupons(type, id, index) {
let token = this.$store.getters.getToken
if (token == '') {
let userLogin = new userAuth()
userLogin.Login()
return
}
if (type === 'more') {
this.$Router.push({
name: 'CouponsList'
})
return
}
if (type === 'get') {
managesCoupons(id).then(res => {
this.$set(this.coupons, index, res)
uni.showToast({
title: '领取成功',
type: 'primary',
duration: 3000
})
}).catch(err => {
uni.showToast({
icon: 'none',
title: err.message
})
})
}
},
// 企业广场
getCompanies() {
companies().then(res => {
this.recommendBus = res.positions
this.hotBus = res.hot
this.industryBus = [{
title: '全部',
industry_id: ''
}, ...res.industries]
this.getCompaniesList()
}).catch(err => {
uni.showToast({
title: err.message,
icon: 'none'
})
})
},
// 企业广场行业
onBusIndustry(index) {
this.industryIndex = index
this.busPage = 1
this.getCompaniesList()
},
// 企业列表
getCompaniesList() {
companiesList({
industry_id: this.industryBus[this.industryIndex].industry_id,
page: this.busPage
}).then(res => {
if (res.page.current === 1) {
this.busList = []
}
this.busList = this.busList.concat(res.data)
this.busPage = res.page.current
this.pageStatus = res.page.has_more ? 'more' : 'noMore'
})
},
// 易货首页
getMall() {
mall().then(res => {
@@ -402,55 +193,17 @@
},
// 易货分类
onClassify(id) {
// this.$Router.push({
// name: 'goodsList'
// })
uni.navigateTo({
url: `/pages/goods/lists?type=id&id=${id}`
})
},
// 打开微信小程序
onOpenWechat(e) {
plus.share.getServices(res => {
let sweixin = null;
for (let val of res) {
if (val.id === 'weixin') {
sweixin = val
}
}
/** 以此为例子 显示跳转引导页
* 'index_4'
* index 跳小程序企业首页
* 4 企业id
**/
if (sweixin != null) {
sweixin.launchMiniProgram({
id: e.original_id,
path: 'pages/login/guide?scene=index_' + e.company_id,
})
} else {
uni.showToast({
title: '当前环境不支持打开微信小程序',
icon: 'none'
})
}
})
}
},
// 下拉加载
onReachBottom() {
if (this.pageStatus == 'more') {
this.pageStatus = 'loading'
switch (this.tabIndex) {
case 0:
this.goodsPage += 1
this.getGoods()
break;
case 1:
this.busPage += 1
this.getCompaniesList()
break;
}
this.goodsPage += 1
this.getGoods()
}
}
}
@@ -512,7 +265,7 @@
color: $text-gray;
.is_allow_values {
color: #fff;
background-image: linear-gradient(to left,$main-color,$mian-color-light);
background-image: linear-gradient(to left,$mian-color,$mian-color-light);
padding: 2rpx 14rpx;
font-size: 20rpx;
text-align: center;
@@ -564,7 +317,7 @@
line-height: 50rpx;
.is_allow_values {
color: #fff;
background-image: linear-gradient(to left,$main-color,$mian-color-light);
background-image: linear-gradient(to left,$mian-color,$mian-color-light);
padding: 2rpx 14rpx;
font-size: 20rpx;
text-align: center;

82
pages/equity/search.vue
View File

@@ -30,23 +30,10 @@
</view>
<view class="lists">
<!-- 优选商品 -->
<goods-list :list="searchArr" priceType="CNY" v-if="searchType == 0" @on-goods="onGoods" />
<!-- 商家 -->
<industry-list :list="searchArr" v-if="searchType == 1" @on-industry="onOpenWechat" />
<goods-list :list="searchArr" priceType="CNY" @on-goods="onGoods" />
</view>
<!-- 分页 -->
<uni-load-more :status="pageStatus" :iconSize="16" v-if="searchArr.length > 0" />
<!-- 企业分类弹出 -->
<view class="companyBack" :class="companyShow ? 'active' : ''"></view>
<view class="companyPopup" :class="companyShow ? 'active' : ''">
<view class="nowrap companyPopup-label" :class="{'show': item.industry_id == companyId}"
v-for="(item, index) in categoryArr" :key="index" @click="companyList(item.industry_id, index)">
{{item.title}}
</view>
</view>
</view>
</template>
@@ -62,8 +49,8 @@
return {
nameVal: '',
searchArr: [],
searchType: '0', // 分类 0位商品 1为企业
marketType: 'asc', // 排序
<<<<<<< HEAD
pvType:'asc',
categoryArr: [], // 分类数组--企业
companyId: '', // 分类数组--企业id
@@ -85,10 +72,20 @@
if (this.searchType == '0') wechaUrl = 'mall/randgoods' //商品关键字
if (this.searchType == '1') wechaUrl = 'companies/rand' //商品关键字
randgoodsUrl(wechaUrl, {
=======
// 分页
pageStatus: '',
goodsPage: 1
}
},
onLoad() {
randgoodsUrl('mall/randgoods', {
>>>>>>> 72a3d53a17d6eb8e9823c8383c6eb07b896d9c4a
type: 1
}).then(res => {
this.nameVal = res.name
})
<<<<<<< HEAD
// 企业分类数据
if (this.searchType == '1') {
@@ -97,6 +94,8 @@
})
}
=======
>>>>>>> 72a3d53a17d6eb8e9823c8383c6eb07b896d9c4a
},
methods: {
getShopSelf(){
@@ -126,41 +125,9 @@
}
})
},
// 打开微信小程序
onOpenWechat(e) {
plus.share.getServices(res => {
let sweixin = null;
for (let val of res) {
if (val.id === 'weixin') {
sweixin = val
}
}
/** 以此为例子 显示跳转引导页
* 'index_4'
* index 跳小程序企业首页
* 4 企业id
**/
if (sweixin != null) {
sweixin.launchMiniProgram({
id: e.original_id,
path: 'pages/login/guide?scene=index_' + e.company_id,
})
} else {
uni.showToast({
title: '当前环境不支持打开微信小程序',
icon: 'none'
})
}
})
},
// 列表数据
getList() {
// type=0为商品列表; type=1为企业列表
let wechaUrl = '' // 定义接口来源名称
if (this.searchType == '0') wechaUrl = 'mall/goods' // 商品列表
if (this.searchType == '1') wechaUrl = 'companies/lists' //企业列表
searchUrl(wechaUrl, {
searchUrl('mall/goods', {
page: this.goodsPage,
order_by: this.marketType,
industry_id: this.companyId,
@@ -168,7 +135,7 @@
is_self:this.goodsType[this.goodsTypeIndex].id,
pv:this.pvType
}).then(res => {
if (res.page.current === 1) {
if (this.goodsPage === 1) {
this.searchArr = []
}
this.searchArr = this.searchArr.concat(res.data)
@@ -206,20 +173,6 @@
this.$Router.push({
name: 'goodsClassify'
})
},
// 查看企业行业
companyOpne() {
this.companyShow = !this.companyShow
},
// 筛选企业列表
companyList(id, index) {
this.companyId = id
this.companyName = this.categoryArr[index].title
this.companyShow = false
// 获取全局列表
this.getList();
}
},
@@ -267,7 +220,7 @@
.search-btn {
line-height: 60rpx;
color: #e93340;
color: $mian-color;
}
}
@@ -280,7 +233,6 @@
box-sizing: border-box;
line-height: 80rpx;
text-align: center;
.tabs-item {
font-size: $title-size-m;
color: $text-gray;

2
pages/goods/addClassify.vue
View File

@@ -62,7 +62,7 @@
&.show{
position: relative;
background: white;
color: $text-price;
color: $mian-color;
font-weight: bold;
&::before{
position: absolute;

2
pages/goods/attestation.vue
View File

@@ -152,7 +152,7 @@
.authenticationTop {
width: 100%;
padding: 20rpx 50rpx;
background-color: $main-color;
background-color: $mian-color;
font-size: 26rpx;
color: #fff;
border-radius: 60rpx;

28
pages/goods/confirmOrder.vue
View File

@@ -39,7 +39,7 @@
<view class="pay-select">请选择支付方式</view>
<view class="pay-select-item" @click="selectPay('2')">
<view class="pay-left">
<u-icon class="wx-icon" name="weixin-fill" color="#fff" size="40"></u-icon>
<u-icon class="pay-icon wx-icon" name="weixin-fill" color="#fff" size="40"></u-icon>
<view class="pay-wx-title">
微信支付
<span>推荐微信用户使用</span>
@@ -50,7 +50,7 @@
</view>
<view class="pay-select-item" @click="selectPay('3')">
<view class="pay-left">
<u-icon class="wx-icon" name="zhifubao" color="#fff" size="40"></u-icon>
<u-icon class="pay-icon al-icon" name="zhifubao" color="#fff" size="40"></u-icon>
<view class="pay-wx-title">
支付宝支付
<span>推荐支付宝用户使用</span>
@@ -59,18 +59,6 @@
<u-icon v-if="selectTypeId!== '3'" name="checkmark-circle" color="#f7f7f7" size="50"></u-icon>
<u-icon v-else name="checkmark-circle-fill" color="#8b64fd" size="50"></u-icon>
</view>
<!-- <view class="pay-select-item" @click="selectPay('1')">
<view class="pay-left">
<u-icon class="wx-icon" name="integral-fill" color="#fff" size="40"></u-icon>
<view class="pay-wx-title">
E币交易
<span>可用Eb总额：{{account.getEBBalance}}</span>
</view>
</view>
<u-icon v-if="selectTypeId!== '1'" name="checkmark-circle" color="#f7f7f7" size="50" />
<u-icon v-else name="checkmark-circle-fill" color="#8b64fd" size="50" />
</view> -->
</view>
<!-- 订单 -->
<view class="actions">
@@ -275,7 +263,7 @@
},
fail: (err) => {
uni.showToast({
title: '支付失败',
title: '支付失败' + err,
duration: 3000,
mask: true,
icon: 'none'
@@ -398,11 +386,15 @@
}
}
}
.wx-icon {
background-color: #8b64fd;
.pay-icon{
border-radius: 10rpx;
padding: 10rpx;
&.wx-icon {
background: #04BE02;
}
&.al-icon {
background: #1678ff;
}
}
}

10
pages/goods/details.vue
View File

@@ -2,7 +2,7 @@
<view class="content" v-if="!loding">
<!-- 轮播主图 -->
<view class="goods-covers">
<swiper class="swiper" indicator-dots indicator-active-color="#c82626">
<swiper class="swiper" indicator-dots indicator-active-color="#8b64fd">
<block v-if="goodsObj.pictures.length > 0">
<swiper-item v-for="(item, index) in goodsObj.pictures" :key="index">
<image class="swiper-item" :src="item" mode="aspectFill" />
@@ -45,7 +45,7 @@
<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"
<uni-rate :readonly="true" color="#ddd" active-color="#ee4c47" :value="goodsObj.company.star"
:size="14" />
</view>
<view class="openbtn" @click="onOpenWechat">进店<image class="openbtn-img"
@@ -87,8 +87,7 @@
<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>
<view class="nowrap goods-serve-name"><textv-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>
@@ -707,7 +706,6 @@
width: 100%;
z-index: 99;
box-sizing: border-box;
.btn[size='default'] {
width: 100%;
height: 90rpx;
@@ -715,7 +713,7 @@
padding: 0;
border-radius: 0;
box-sizing: border-box;
background: $text-price;
background: $mian-color;
color: white;
font-weight: bold;
font-size: $title-size;

5
pages/goods/goodsClassify.vue
View File

@@ -64,18 +64,17 @@
line-height: 90rpx;
color: $text-gray;
@extend .nowrap;
&.show {
position: relative;
background: white;
color: $text-price;
color: $mian-color;
font-weight: bold;
&::before {
position: absolute;
height: 40rpx;
width: 5rpx;
background: $text-price;
background: $mian-color;
content: " ";
left: 0;
top: 20rpx;

3
pages/goods/lists.vue
View File

@@ -173,9 +173,8 @@
margin-left: $margin / 3;
margin-bottom: 4rpx;
}
&.show {
color: $text-price;
color: $mian-color;
}
}
}

6
pages/goods/management.vue
View File

@@ -259,8 +259,8 @@
height: 60rpx;
line-height: 60rpx;
&.show{
color: $text-price;
border-bottom: solid 4rpx $text-price;
color: $mian-color;
border-bottom: solid 4rpx $mian-color;
}
}
}
@@ -297,7 +297,7 @@
font-weight: bold;
}
.btn {
background-color: $text-price;
background-color: $mian-color;
height: 90rpx;
line-height: 90rpx;
text-align: center;

6
pages/goods/payStatus.vue
View File

@@ -85,14 +85,14 @@
width: 100%;
.check {
border: $main-color solid 1rpx;
color: $main-color;
border: $mian-color solid 1rpx;
color: $mian-color;
padding: 14rpx 50rpx;
border-radius: 4rpx;
}
.back {
background-color: $main-color;
background-color: $mian-color;
color: #fff;
padding: 14rpx 50rpx;
border-radius: 4rpx;

2
pages/goods/tracedTo.vue
View File

@@ -100,7 +100,7 @@
.authenticationTop {
width: 100%;
padding: 20rpx 50rpx;
background-color: $main-color;
background-color: $mian-color;
font-size: 26rpx;
color: #fff;
border-radius: 60rpx;

353
pages/market/details.vue Normal file
View File

@@ -0,0 +1,353 @@
<template>
<view v-if="!loding">
<!-- 产品信息 -->
<view class="goods">
<image class="cover" :src="info.goods.cover" mode="aspectFill"></image>
<view class="content">
<view class="title nowrap">数字权证</view>
<view class="text nowrap">锚定商品：{{info.goods.goods_name}}</view>
<view class="text nowrap">提供企业：{{info.company.name}}</view>
<view class="text nav-goods nowrap" @click="onGoods">查看锚定商品信息<uni-icons type="arrowright" size="12" color="#8b64fd"></uni-icons></view>
</view>
<view class="info">
<view class="info-item">
<label>转让用户</label>
{{info.user.username}}
</view>
<view class="info-item">
<label>转让单价</label>
￥{{info.price}}
</view>
<view class="info-item">
<label>出售数量</label>
{{info.stock}}
</view>
<view class="info-item">
<label>剩余转让数量</label>
{{info.surplus}}
</view>
<view class="info-item">
<label>区块HASH</label>
{{info.hash}}
</view>
<view class="info-item">
<label>转让时间</label>
{{info.created_at}}
</view>
</view>
</view>
<button class="buy-btn" type="default" @click="openLay">我要购买</button>
<!-- 购买弹窗 -->
<uni-popup ref="buyLay" :safe-area="true" background-color="#ffffff">
<view class="popup">
<view class="title">我要购买</view>
<view class="des">
剩余转让数量
<text>{{info.surplus}}</text>
</view>
<view class="des">
数量
<uni-number-box v-model='stock' :min="1" :max="info.surplus" @change="countPrice"></uni-number-box>
</view>
<view class="des">
订单总价
<text class="price">￥{{price}}</text>
</view>
<view class="btn" @click="buy">提交订单</view>
</view>
</uni-popup>
<!-- 支付方式 -->
<uni-popup ref="payLay" :safe-area="true" background-color="#ffffff">
<view class="popup">
<view class="title">支付方式</view>
<radio-group class="pay-group" @change="payType">
<view class="item">
<label>
<radio class="pay-radio" value="eb" checked color="#8b64fd" />
<view class="pay-title">易货额支付</view>
<view class="pay-sub-title">可用{{account.eb}}，冻结{{account.frozenEb}}</view>
</label>
</view>
<view class="item">
<label>
<radio class="pay-radio" value="wechat" color="#8b64fd" />
<view class="pay-title">微信支付</view>
</label>
</view>
</radio-group>
<view class="btn" @click="orderPay">立即支付</view>
</view>
</uni-popup>
</view>
</template>
<script>
import { marketsInfo, marketsBuy, marketsPay } from '@/apis/interfaces/market'
import userAuth from '@/public/userAuth'
export default {
data() {
return {
payValue: 'eb',
orderNo : '',
price : '0.00',
stock : 1,
loding : true,
info : {},
account : {
eb : '0.00',
frozenEb: '0.00'
}
};
},
onShow() {
marketsInfo(this.$Route.query.marketId).then(res =>{
this.info = res
this.price = res.price
this.loding = false
}).catch(err => {
uni.showToast({
title: err.message,
icon : 'none'
})
})
},
methods:{
// 查看锚定产品
onGoods(){
this.$Router.push({name: 'marketGoods', params: { id: this.info.goods.goods_id }})
},
// 选择购买方式
payType(e){
this.payValue = e.detail.value
},
// 购买弹窗
openLay(){
let token = this.$store.getters.getToken
if(token == ''){
let userLogin = new userAuth()
userLogin.Login()
return
}
this.$refs.buyLay.open('bottom')
},
// 计算价格
countPrice(e){
this.price = (e * this.info.price).toFixed(2)
},
// 提交购买单
buy(){
marketsBuy(this.info.market_id, {
qty: this.stock
}).then(res => {
this.account = res.account
this.orderNo = res.market_order_no
this.$refs.buyLay.close()
this.$refs.payLay.open('bottom')
}).catch(err => {
uni.showToast({
title: err.message,
icon : 'none'
})
})
},
// 支付
orderPay(){
let data = {}
marketsPay(this.orderNo, this.payValue).then(res => {
switch (this.payValue){
case 'eb':
this.$refs.payLay.close()
this.$Router.push({
name : 'payResults',
params : {
index: 1,
price: this.price,
type : 'eb',
total: '可在我的资产下我的权证中查看购买的数字权证'
}
})
break
case 'wechat':
this.wxPay(JSON.parse(res))
break
}
}).catch(err => {
uni.showToast({
title: err.message,
icon : 'none'
})
})
},
// 微信支付
wxPay(payConfig){
uni.requestPayment({
provider : 'wxpay',
orderInfo : payConfig,
success : payRes => {
console.log(payRes)
},
fail : payErr => {
uni.showToast({
title: payErr.errMsg,
icon : 'none'
})
}
})
}
}
}
</script>
<style lang="scss" scoped>
// 支付方式
.pay-group{
margin: 0 ($margin * 2);
.item{
position: relative;
border-bottom: solid 1rpx $border-color;
padding: $padding 0;
&:last-child{
border-bottom: none;
}
.pay-radio{
position: absolute;
right: 0;
top: 50%;
margin-top: -25rpx;
}
.pay-sub-title{
font-size: $title-size-sm;
color: $text-gray;
line-height: 40rpx;
}
.pay-title{
font-weight: bold;
line-height: 50rpx;
color: $text-color;
font-size: $title-size-lg;
text-align: left;
}
}
}
// 我要购买按钮
.buy-btn{
margin: 0 $margin;
background: $mian-color;
color: white;
height: 90rpx;
line-height: 90rpx;
padding: 0;
border-radius: $radius/2;
font-size: $title-size;
font-weight: bold;
&::after{
border: none;
}
}
// 产品信息
.goods{
min-height: 168rpx;
position: relative;
background: white;
border-radius: $radius/2;
margin: $margin;
padding: $padding;
.cover{
position: absolute;
left: $padding;
top: $padding;
width: 168rpx;
height: 168rpx;
}
.content{
padding-left: calc(168rpx + #{$padding});
.title{
position: relative;
font-size: $title-size-lg;
color: $text-color;
font-weight: bold;
line-height: 52rpx;
padding-right: 60rpx;
text{
position: absolute;
right: 0;
top: 0;
width: 60rpx;
text-align: right;
font-weight: normal;
}
}
.text{
font-size: $title-size-sm;
color: $text-gray;
height: 40rpx;
line-height: 40rpx;
&.nav-goods{
color: $mian-color;
}
}
}
.info{
margin-top: $margin;
border-top: solid 1rpx $border-color;
padding-top: $padding;
.info-item{
padding-left: 200rpx;
height: 60rpx;
line-height: 60rpx;
position: relative;
text-align: right;
font-size: $title-size-m;
@extend .nowrap;
label{
position: absolute;
left: 0;
top: 0;
width: 200rpx;
text-align: left;
color: $text-gray;
}
}
}
}
// 购买产品
.popup {
width: 100%;
background-color: #fff;
padding-bottom: $padding;
.title {
font-size: 36rpx;
text-align: center;
padding: 50rpx 30rpx 30rpx 30rpx;
font-weight: bold;
}
.btn {
background-color: $mian-color;
height: 90rpx;
line-height: 90rpx;
text-align: center;
color: #fff;
font-weight: bold;
font-size: $title-size;
margin: $padding * 2;
border-radius: $radius/2;
}
.des {
display: flex;
flex-direction: row;
align-items: center;
justify-content: space-between;
box-sizing: border-box;
padding: $padding $padding * 2;
color: $text-gray;
font-size: $title-size-lg;
text{
color: $text-color;
}
.price{
color: $text-price;
font-weight: bold;
}
}
}
</style>

116
pages/market/goods.vue Normal file
View File

@@ -0,0 +1,116 @@
<template>
<view>
<view class="goods-cover">
<swiper class="swiper" circular indicator-dots indicator-active-color="#8b64fd">
<swiper-item v-for="(item, index) in cover" :key="index">
<view class="swiper-item">
<image class="swiper-cover" :src="item" mode="aspectFill" />
</view>
</swiper-item>
</swiper>
</view>
<view class="info">
<view class="info-item">
<label>锚定商品</label>
{{info.name}}
</view>
<view class="info-item">
<label>商品规格</label>
{{info.skusUnit}}
</view>
<view class="info-item">
<label>提供企业</label>
{{info.companyName}}
</view>
<view class="info-item">
<label>企业诚信</label>
{{info.integrity}}
</view>
<view class="info-item">
<label>权证销量</label>
{{info.sales}}
</view>
<view class="info-item">
<label>发布时间</label>
{{info.createdAt}}
</view>
</view>
</view>
</template>
<script>
import { goods } from '@/apis/interfaces/goods'
export default {
data() {
return {
cover: [],
info : {}
};
},
created() {
goods(this.$Route.query.id).then(res => {
console.log(res)
this.cover = res.pictures
this.info = {
name : res.name,
companyName : res.company.name,
createdAt : res.created_at,
sales : res.sales,
integrity : res.company.integrity,
skusUnit : res.skus[0].unit
}
}).catch(err => {
uni.showToast({
title: err.message,
icon : 'none'
})
})
}
}
</script>
<style lang="scss">
// 数权
.goods-cover{
width: 100%;
padding-top: 100%;
position: relative;
background: #f5f5f5;
.swiper{
position: absolute;
top: 0;
left: 0;
width: 100%;
height: 100%;
.swiper-item{
height: 100%;
width: 100%;
}
.swiper-cover{
@extend .swiper-item;
}
}
}
// 锚定商品详情
.info{
background: white;
padding: $padding;
.info-item{
padding-left: 200rpx;
height: 70rpx;
line-height: 70rpx;
position: relative;
text-align: right;
font-size: $title-size-m;
@extend .nowrap;
label{
position: absolute;
left: 0;
top: 0;
width: 200rpx;
text-align: left;
color: $text-gray;
}
}
}
</style>

153
pages/market/index.vue Normal file
View File

@@ -0,0 +1,153 @@
<template>
<view>
<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">
价格
<image
class="icon"
mode="widthFix" :src="require(marketType == 'asc' ? '@/static/icons/market_icon_low.png': '@/static/icons/market_icon_high.png')"
/>
</view>
</view>
<view class="lists">
<view class="item" v-for="(item, index) in marketArray" :key="index" @click="onDetails(item)">
<image class="cover" :src="item.goods.cover" mode="aspectFill"></image>
<view class="content">
<view class="title nowrap">数字权证<text>{{item.surplus}}/{{item.stock}}</text></view>
<view class="text nowrap">锚定商品：{{item.goods.goods_name}}</view>
<view class="text nowrap">提供企业：{{item.company.name}}</view>
<view class="text nowrap">转让用户：{{item.user.nickname}}</view>
</view>
<view class="price">￥{{item.price}}/个</view>
</view>
</view>
</view>
</template>
<script>
import { markets } from '@/apis/interfaces/market'
export default {
data() {
return {
tabIndex : 0,
marketType : 'asc',
marketArray : [],
page : {}
};
},
onShow() {
this.getMarkets()
},
methods:{
// 筛选产品
onTabs(e){
let index = e.target.dataset.index
if(index == 0 && index == this.tabIndex) return
if(index == 1 && index == this.tabIndex) this.marketType = this.marketType == 'asc' ? 'desc': 'asc'
this.tabIndex = index
this.getMarkets()
},
// 获取转让市场
getMarkets(){
markets({
sort: this.tabIndex == 1 ? this.marketType : ''
}).then(res => {
this.marketArray = res.data
this.page = res.page
})
},
// 转让商品详情
onDetails(e){
this.$Router.push({name: 'marketDetails', params: {marketId: e.market_id}})
console.log(e)
}
},
onNavigationBarButtonTap(){
this.$Router.push({name: "marketLogs"})
}
}
</script>
<style lang="scss" scoped>
.tabs{
position: fixed;
top: 0;
left: 0;
z-index: 9;
width: 100%;
display: flex;
justify-content: space-around;
background: white;
height: 70rpx;
line-height: 70rpx;
text-align: center;
.tabs-item{
font-size: $title-size-m;
color: $text-gray;
.icon{
width: 32rpx;
height: 32rpx;
vertical-align: middle;
margin-left: $margin / 3;
margin-bottom: 4rpx;
}
&.show{
color: $mian-color;
}
}
}
// 列表
.lists{
padding: 70rpx $padding $padding;
.item{
min-height: 168rpx;
position: relative;
background: white;
border-radius: $radius/2;
margin-top: $margin;
padding: $padding;
.cover{
position: absolute;
left: $padding;
top: $padding;
width: 168rpx;
height: 168rpx;
}
.content{
padding-left: calc(168rpx + #{$padding});
.title{
position: relative;
font-size: $title-size-lg;
color: $text-color;
font-weight: bold;
line-height: 52rpx;
padding-right: 60rpx;
text{
position: absolute;
right: 0;
top: 0;
width: 60rpx;
text-align: right;
font-weight: normal;
}
}
.text{
font-size: $title-size-sm;
color: $text-gray;
height: 40rpx;
line-height: 40rpx;
}
}
.price{
margin-top: $margin - 10;
padding-top: $padding - 10;
font-size: $title-size-m;
text-align: right;
border-top: solid 1rpx $border-color;
font-weight: bold;
color: $text-price;
}
}
}
</style>

166
pages/market/logs.vue Normal file
View File

@@ -0,0 +1,166 @@
<template>
<view>
<view class="tabs" v-if="$Route.query.type === 'my'">
<view class="item" :class="{ 'show' : tab == 'sell'}" @click="onTasb('sell')">我转让的</view>
<view class="item" :class="{ 'show' : tab == 'buys' }" @click="onTasb('buys')">我买到的</view>
</view>
<block v-if="logs.length > 0">
<view :class="{'paddingTop': $Route.query.type === 'my'}">
<view class="logs" v-for="(item, index) in logs" :key="index">
<view class="logs-item">
<label>交易权证</label>
{{item.goods.goods_name}}
</view>
<view class="logs-item">
<label>交易单价</label>
￥{{item.price}}
</view>
<view class="logs-item">
<label>交易数量</label>
{{item.qty}}
</view>
<view class="logs-item">
<label>转让用户</label>
{{item.sellUser.nickname}}
</view>
<view class="logs-item">
<label>购买用户</label>
{{item.buyUser.nickname}}
</view>
<view class="logs-item">
<label>交易时间</label>
{{item.created_at}}
</view>
</view>
</view>
</block>
<block v-else>
<view class="list-null">
<image class="icon" src="@/static/icons/listnull-icon.png" mode="widthFix" />
<view class="sub-title">暂无数据</view>
</view>
</block>
</view>
</template>
<script>
import { marketsLogs, marketsOrdersLogs } from '@/apis/interfaces/market'
export default {
data() {
return {
logs: [],
page: {},
tab : 'sell'
};
},
created(){
this.getList()
},
methods:{
onTasb(e){
this.tab = e
this.getList()
},
// 获取列表
getList(){
if(this.$Route.query.type === 'my'){
marketsOrdersLogs({}, this.tab).then(res =>{
console.log(res)
this.logs = res.data
this.page = res.page
}).catch(err => {
uni.showToast({
title: err.message,
icon : 'none'
})
})
return
}
marketsLogs().then(res => {
this.logs = res.data
this.page = res.page
}).catch(err => {
uni.showToast({
title: err.message,
icon : 'none'
})
})
}
}
}
</script>
<style lang="scss" scoped>
.tabs{
position: fixed;
top: 0;
left: 0;
width: 100%;
z-index: 99;
background-color: white;
height: 90rpx;
line-height: 90rpx;
display: flex;
justify-content: space-around;
.item{
border-bottom: solid 2rpx white;
box-sizing: border-box;
&.show{
border-color: $mian-color;
color: $mian-color;
}
}
}
.paddingTop{
padding-top: 90rpx;
}
.logs{
background: white;
margin-top: $margin;
padding: ($padding - 10) $padding;
.logs-item{
padding-left: 200rpx;
height: 50rpx;
line-height: 50rpx;
position: relative;
text-align: right;
font-size: $title-size-m;
@extend .nowrap;
label{
position: absolute;
left: 0;
top: 0;
width: 200rpx;
text-align: left;
color: $text-gray;
}
}
}
// 空提示
.list-null{
width: 100vw;
height: 100vh;
box-sizing: border-box;
text-align: center;
background: white;
padding-bottom: 20vh;
@extend .vertical;
.sub-title{
color: $text-gray;
font-size: $title-size-m;
}
.icon{
width: 288rpx;
}
}
.employees-null{
text-align: center;
line-height: 10vh;
padding-bottom: $padding;
font-size: $title-size-m;
color: $text-gray;
}
</style>

169
pages/market/management.vue Normal file
View File

@@ -0,0 +1,169 @@
<template>
<view class="NumberWeight">
<!-- 有订单列表 -->
<view v-if="lists.length > 0">
<block v-for="(item, index) in lists" :key="index">
<view class="order-item">
<view class="order-info">
<image class="order-cover" :src="item.goods.cover" mode="aspectFill"></image>
<view class="title">数字权证<text>{{item.surplus}}/{{item.stock}}</text></view>
<view class="text">锚定商品：{{item.goods.goods_name}}</view>
<view class="text">交易哈希：{{item.hash}}</view>
<view class="text">发布时间：{{item.created_at}}</view>
</view>
<view class="order-tool">
<view class="price">{{item.price}}/个</view>
<view class="order-btn" v-if="item.status.value === 1" @click="removeGoods(item.market_id, index)">取消转让</view>
<view class="order-status" v-if="item.status.value === 2">{{item.status.text}}</view>
</view>
</view>
</block>
</view>
<!-- 没有订单列表 -->
<no-list v-if="lists.length === 0" name="no-order" txt="暂无数据~" />
<u-toast ref="uToast" />
</view>
</template>
<script>
import { marketsMag, marketsCancel } from '@/apis/interfaces/market';
export default {
data() {
return {
lists: [],
page: 1,
total: 0
};
},
onLoad() {
this.getList();
},
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: {
getList() {
let data = {
perPage: 10,
page: this.page
};
marketsMag(data)
.then(res => {
console.log(res.markets.data);
this.lists = this.lists.concat(res.markets.data);
this.total = res.markets.page.total;
})
.catch(err => {
this.$refs.uToast.show({
title: err.message,
type: 'error',
icon: false,
duration: 3000
});
});
},
// 取消转让
removeGoods(id, index) {
marketsCancel(id).then(res => {
uni.showToast({
icon : 'none',
title: res
})
let statusObj = this.lists[index]
statusObj.status = {
value: 2,
text : '已取消',
}
this.$set(this.lists, index, statusObj)
}).catch(err => {
uni.showToast({
icon : 'none',
title: err.message
})
})
}
},
onNavigationBarButtonTap(){
this.$Router.push({name: "marketLogs", params: {type: 'my'}})
}
};
</script>
<style lang="scss" scoped>
.NumberWeight {
box-sizing: border-box;
// 订单列表
.order-item {
background-color: white;
margin: $margin;
border-radius: $radius;
padding: $padding;
.order-info{
position: relative;
padding-left: 188rpx;
min-height: 168rpx;
.order-cover{
position: absolute;
top: 0;
left: 0;
height: 168rpx;
width: 168rpx;
}
.title{
font-weight: bold;
font-size: $title-size-lg;
color: $text-color;
line-height: 48rpx;
height: 48rpx;
display: flex;
justify-content: space-between;
text{
font-size: 80%;
font-weight: normal;
}
}
.text{
line-height: 40rpx;
height: 40rpx;
font-size: $title-size-sm;
color: $text-gray;
@extend .nowrap;
}
}
.order-tool{
margin-top: $margin - 10;
padding-top: $padding - 10;
border-top: solid 1rpx $border-color;
display: flex;
justify-content: space-between;
.price{
color: $text-price;
font-weight: bold;
font-size: $title-size-m;
line-height: 50rpx;
}
.order-btn{
background: $mian-color;
color: white;
padding: 0 $padding;
line-height: 50rpx;
border-radius: 25rpx;
font-size: $title-size-m;
}
.order-status{
color: $text-gray-m;
}
}
}
}
</style>

249
pages/market/transfer.vue Normal file
View File

@@ -0,0 +1,249 @@
<template>
<view v-if="!loding">
<!-- 产品信息 -->
<view class="goods">
<image class="cover" :src="info.goods.cover" mode="aspectFill"></image>
<view class="content">
<view class="title nowrap">数字权证</view>
<view class="text nowrap">锚定商品：{{info.goods.goods_name}}</view>
<view class="text nowrap">提供企业：{{info.goods.company.name}}</view>
<view class="text nav-goods nowrap" @click="onGoods">查看锚定商品信息<uni-icons type="arrowright" size="12" color="#e93340"></uni-icons></view>
</view>
<view class="info">
<view class="info-item">
<label>权证销售单价</label>
￥{{info.goods.price}}
</view>
<view class="info-item">
<label>拥有数量</label>
{{info.account.balance}}
</view>
<view class="info-item">
<label>转让价格</label>
<input class="info-input" type="digit" v-model="pirce" placeholder="输入转让价格" maxlength="5" @blur="calculatePirce" />
</view>
<view class="info-item info-flex">
<label>转让数量</label>
<uni-number-box class="info-number" v-model='stock' :min="1" :max="info.account.balance" @change="countPrice"></uni-number-box>
</view>
<view class="info-item">
<label>预估转让收益</label>
<view class="price">{{forecast}}</view>
</view>
</view>
</view>
<button class="buy-btn" type="default" @click="onCreate">确认转让</button>
<u-toast ref="uToast" />
</view>
</template>
<script>
import { marketsCreateInfo, marketsCreate } from '@/apis/interfaces/market'
export default {
data() {
return {
loding : true,
pirce : '',
stock : 1,
info : {},
forecast: '0.00'
};
},
onShow() {
marketsCreateInfo(this.$Route.query.symbol).then(res =>{
this.info = res
this.loding = false
}).catch(err => {
uni.showToast({
title: err.message,
icon : 'none'
})
})
},
methods:{
// 查看锚定产品
onGoods(){
this.$Router.push({name: 'marketGoods', params: { id: this.info.goods.goods_id }})
},
// 转让数量
countPrice(e){
this.stock = e
this.calculatePirce()
},
// 计算预估收益
calculatePirce(){
this.forecast = (this.pirce * this.stock).toFixed(2)
},
// 提交转让市场
onCreate(){
if(this.pirce === ''){
this.$refs.uToast.show({
title: '请校验转让价格',
type: 'error',icon:false,
duration: 3000
})
}else{
marketsCreate({
symbol : this.$Route.query.symbol,
qty : this.stock,
price : this.pirce || 0
}).then(res => {
uni.setStorageSync('refresh', true)
uni.showModal({
title : '提示',
content : res,
showCancel : false,
success : () => {
this.$Router.back()
}
})
}).catch(err => {
console.log(err)
uni.showToast({
title: err.message,
icon : 'none'
})
})
}
}
}
}
</script>
<style lang="scss" scoped>
// 转让权证
.buy-btn{
margin: 0 $margin;
background: $text-price;
color: white;
height: 90rpx;
line-height: 90rpx;
padding: 0;
border-radius: $radius/2;
font-size: $title-size;
font-weight: bold;
&::after{
border: none;
}
}
// 产品信息
.goods{
min-height: 168rpx;
position: relative;
background: white;
border-radius: $radius/2;
margin: $margin;
padding: $padding;
.cover{
position: absolute;
left: $padding;
top: $padding;
width: 168rpx;
height: 168rpx;
}
.content{
padding-left: calc(168rpx + #{$padding});
.title{
position: relative;
font-size: $title-size-lg;
color: $text-color;
font-weight: bold;
line-height: 52rpx;
padding-right: 60rpx;
text{
position: absolute;
right: 0;
top: 0;
width: 60rpx;
text-align: right;
font-weight: normal;
}
}
.text{
font-size: $title-size-sm;
color: $text-gray;
height: 40rpx;
line-height: 40rpx;
&.nav-goods{
color: $text-price;
}
}
}
.info{
margin-top: $margin;
border-top: solid 1rpx $border-color;
padding-top: $padding;
.info-item{
padding-left: 200rpx;
height: 90rpx;
line-height: 90rpx;
position: relative;
text-align: right;
font-size: $title-size-lg;
&.info-flex{
display: flex;
justify-content: flex-end;
align-items: center;
}
@extend .nowrap;
label{
position: absolute;
left: 0;
top: 0;
width: 200rpx;
text-align: left;
color: $text-gray;
}
.info-input{
height: 80rpx;
line-height: 80rpx;
font-size: $title-size-lg;
}
.price{
color: $text-price;
font-weight: bold;
}
}
}
}
// 购买产品
.popup {
width: 100%;
background-color: #fff;
padding-bottom: $padding;
.title {
font-size: 36rpx;
text-align: center;
padding: 50rpx 30rpx 30rpx 30rpx;
font-weight: bold;
}
.btn {
background-color: $text-price;
height: 90rpx;
line-height: 90rpx;
text-align: center;
color: #fff;
font-weight: bold;
font-size: $title-size;
margin: $padding * 2;
border-radius: $radius/2;
}
.des {
display: flex;
flex-direction: row;
align-items: center;
justify-content: space-between;
box-sizing: border-box;
padding: $padding $padding * 2;
color: $text-gray;
font-size: $title-size-lg;
text{
color: $text-color;
}
.price{
color: $mian-color;
font-weight: bold;
}
}
}
</style>

36
pages/user/index.vue
View File

@@ -209,32 +209,6 @@
</view>
</view>
</view>
<!-- 我的权证 -->
<!-- <view class="user-group">
<view class="title">
<view class="title-text">我的权证</view>
</view>
<view class="group-flex group-flex-4">
<view class="item" @click="$Router.push({name:'NumberWeight'})">
<view class="item-num">{{count.warrnats}}</view>
<view class="item-title">权证持有</view>
</view>
<view class="item" @click="$Router.push({name: 'marketManag'})">
<view class="item-num">{{count.warrnat_transfer}}</view>
<view class="item-title">权证转让</view>
</view>
<view class="item" @click="$Router.push({name:'ServicesOrder'})">
<view class="item-num">{{count.shipment_fuwu_count}}</view>
<view class="item-title">已使用</view>
</view>
<view class="item" @click="$Router.push({name:'MallShipments'})">
<view class="item-num">{{count.shipment_goods_count}}</view>
<view class="item-title">已提货</view>
</view>
</view>
</view> -->
<!-- 我的权证 -->
<view class="userPartner">
<view class="partner-title">
@@ -242,17 +216,21 @@
</view>
<view class="tool-list">
<view class="tool-label" @click="$Router.push({name:'NumberWeight'})">
<image class="tool-label-img" src="/static/user/userServe-00.png" mode=""></image>
<image class="tool-label-img" src="/static/user/authorityCard-00.png" mode=""></image>
<view class="tool-label-name">权证持有</view>
</view>
<view class="tool-label" @click="$Router.push({name:'ServicesOrder'})">
<image class="tool-label-img" src="/static/user/userServe-02.png" mode=""></image>
<image class="tool-label-img" src="/static/user/authorityCard-01.png" mode=""></image>
<view class="tool-label-name">已使用</view>
</view>
<view class="tool-label" @click="$Router.push({name:'MallShipments'})">
<image class="tool-label-img" src="/static/user/userServe-03.png" mode=""></image>
<image class="tool-label-img" src="/static/user/authorityCard-03.png" mode=""></image>
<view class="tool-label-name">已提货</view>
</view>
<view class="tool-label" @click="$Router.push({name: 'marketManag'})">
<image class="tool-label-img" src="/static/user/authorityCard-02.png" mode=""></image>
<view class="tool-label-name">权证转让</view>
</view>
</view>
</view>

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

@@ -96,7 +96,7 @@
.copy {
display: inline-block;
padding: $padding *0.4 $padding;
background-color: $main-color;
background-color: $mian-color;
margin-left: 30rpx;
color: #fff;
font-size: $title-size *0.8;
@@ -129,7 +129,7 @@
}
&:first-child {
color: $main-color !important;
color: $mian-color !important;
}
.dian {
@@ -143,12 +143,12 @@
}
.dian-active {
background-color: $main-color;
background-color: $mian-color;
width: 30rpx;
height: 30rpx;
left: -16rpx;
border: solid 10rpx rgba($color: $main-color, $alpha: 0.3);
box-shadow: 0 0 20rpx 4rpx rgba($color: $main-color, $alpha: 0.5);
border: solid 10rpx rgba($color: $mian-color, $alpha: 0.3);
box-shadow: 0 0 20rpx 4rpx rgba($color: $mian-color, $alpha: 0.5);
}
.content {
@@ -166,7 +166,7 @@
}
.content-active {
color: $main-color;
color: $mian-color;
}
}
}

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

@@ -256,8 +256,8 @@
}
.nav-item-selected {
border-bottom: solid 4rpx $main-color;
color: $main-color;
border-bottom: solid 4rpx $mian-color;
color: $mian-color;
}
}
@@ -288,7 +288,7 @@
border-radius: 40rpx;
margin-left: 20rpx;
margin-top: 20rpx;
// background-color: $main-color;
// background-color: $mian-color;
color: #999;
border: solid 1rpx #cacaca;
}
@@ -302,7 +302,7 @@
}
.logistics {
background-color: $main-color;
background-color: $mian-color;
padding: 10rpx 30rpx;
border-radius: 40rpx;
margin-left: 20rpx;
@@ -318,7 +318,7 @@
}
.evaluate {
background-color: $main-color;
background-color: $mian-color;
padding: 10rpx 30rpx;
border-radius: 40rpx;
margin-left: 20rpx;

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

@@ -206,7 +206,7 @@
.order-status {
width: 100%;
height: 300rpx;
background-image: linear-gradient(to bottom, $main-color, $main-color-light);
background-image: linear-gradient(to bottom, $mian-color, $mian-color-light);
color: #Fff;
font-size: 36rpx;
padding: 30rpx 50rpx;
@@ -238,7 +238,7 @@
.acceptInfo {
margin: 0 30rpx;
background-color: #fff;
box-shadow: 0 0 14rpx 4rpx rgba($color: $main-color, $alpha: 0.2);
box-shadow: 0 0 14rpx 4rpx rgba($color: $mian-color, $alpha: 0.2);
border-radius: 20rpx;
padding: 30rpx;
position: relative;
@@ -413,7 +413,7 @@
justify-content: flex-end;
box-sizing: border-box;
font-size: 26rpx;
color: $main-color;
color: $mian-color;
flex: 1;
text-align: right;
margin-top: 20rpx;
@@ -421,7 +421,7 @@
}
.total-btn {
border: solid 1rpx $main-color;
border: solid 1rpx $mian-color;
padding: 6rpx 20rpx;
border-radius: 10rpx;
}
@@ -446,7 +446,7 @@
border-radius: 40rpx;
margin-left: 20rpx;
margin-top: 20rpx;
// background-color: $main-color;
// background-color: $mian-color;
color: #999;
border: solid 1rpx #cacaca;
}
@@ -460,7 +460,7 @@
}
.logistics {
background-color: $main-color;
background-color: $mian-color;
padding: 10rpx 30rpx;
border-radius: 40rpx;
margin-left: 20rpx;
@@ -476,7 +476,7 @@
}
.evaluate {
background-color: $main-color;
background-color: $mian-color;
padding: 10rpx 30rpx;
border-radius: 40rpx;
margin-left: 20rpx;
@@ -495,7 +495,7 @@
width: 100%;
.copy {
color: $main-color;
color: $mian-color;
font-size: $title-size*0.8;
font-weight: 400;
padding: 0 30rpx;
@@ -631,8 +631,8 @@
}
.list-top-right {
border: solid 1rpx $main-color;
color: $main-color;
border: solid 1rpx $mian-color;
color: $mian-color;
display: inline-block;
padding: 8rpx 16rpx;
font-size: $title-size *0.8;
@@ -660,7 +660,7 @@
}
&:first-child {
color: $main-color !important;
color: $mian-color !important;
}
.dian {
@@ -674,12 +674,12 @@
}
.dian-active {
background-color: $main-color;
background-color: $mian-color;
width: 30rpx;
height: 30rpx;
left: -16rpx;
border: solid 10rpx rgba($color: $main-color, $alpha: 0.3);
box-shadow: 0 0 20rpx 4rpx rgba($color: $main-color, $alpha: 0.5);
border: solid 10rpx rgba($color: $mian-color, $alpha: 0.3);
box-shadow: 0 0 20rpx 4rpx rgba($color: $mian-color, $alpha: 0.5);
}
.content {
@@ -697,7 +697,7 @@
}
.content-active {
color: $main-color;
color: $mian-color;
}
.pictures{

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

@@ -392,8 +392,8 @@
}
.nav-item-selected {
border-bottom: solid 4rpx $main-color;
color: $main-color;
border-bottom: solid 4rpx $mian-color;
color: $mian-color;
}
}
@@ -418,7 +418,7 @@
}
.nav-item-selected {
color: $main-color;
color: $mian-color;
}
}
@@ -449,7 +449,7 @@
border-radius: 40rpx;
margin-left: 20rpx;
margin-top: 20rpx;
// background-color: $main-color;
// background-color: $mian-color;
color: #999;
border: solid 1rpx #cacaca;
}
@@ -463,7 +463,7 @@
}
.logistics {
background-color: $main-color;
background-color: $mian-color;
padding: 10rpx 30rpx;
border-radius: 40rpx;
margin-left: 20rpx;
@@ -479,7 +479,7 @@
}
.evaluate {
background-color: $main-color;
background-color: $mian-color;
padding: 10rpx 30rpx;
border-radius: 40rpx;
margin-left: 20rpx;

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

@@ -267,7 +267,7 @@
.order-status {
width: 100%;
height: 300rpx;
background-image: linear-gradient(to bottom, $main-color, $main-color-light);
background-image: linear-gradient(to bottom, $mian-color, $mian-color-light);
color: #Fff;
font-size: 36rpx;
padding: 30rpx 50rpx;
@@ -299,7 +299,7 @@
.acceptInfo {
margin: 0 30rpx;
background-color: #fff;
box-shadow: 0 0 14rpx 4rpx rgba($color: $main-color, $alpha: 0.2);
box-shadow: 0 0 14rpx 4rpx rgba($color: $mian-color, $alpha: 0.2);
border-radius: 20rpx;
padding: 30rpx;
position: relative;
@@ -469,7 +469,7 @@
justify-content: flex-end;
box-sizing: border-box;
font-size: 26rpx;
color: $main-color;
color: $mian-color;
flex: 1;
text-align: right;
margin-top: 20rpx;
@@ -477,7 +477,7 @@
}
.total-btn {
border: solid 1rpx $main-color;
border: solid 1rpx $mian-color;
padding: 6rpx 20rpx;
border-radius: 10rpx;
}
@@ -502,7 +502,7 @@
border-radius: 40rpx;
margin-left: 20rpx;
margin-top: 20rpx;
// background-color: $main-color;
// background-color: $mian-color;
color: #999;
border: solid 1rpx #cacaca;
}
@@ -516,7 +516,7 @@
}
.logistics {
background-color: $main-color;
background-color: $mian-color;
padding: 10rpx 30rpx;
border-radius: 40rpx;
margin-left: 20rpx;
@@ -532,7 +532,7 @@
}
.evaluate {
background-color: $main-color;
background-color: $mian-color;
padding: 10rpx 30rpx;
border-radius: 40rpx;
margin-left: 20rpx;
@@ -551,7 +551,7 @@
width: 100%;
.copy {
color: $main-color;
color: $mian-color;
font-size: $title-size*0.8;
font-weight: 400;
padding: 0 30rpx;
@@ -686,8 +686,8 @@
}
.list-top-right {
border: solid 1rpx $main-color;
color: $main-color;
border: solid 1rpx $mian-color;
color: $mian-color;
display: inline-block;
padding: 8rpx 16rpx;
font-size: $title-size *0.8;

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

@@ -241,7 +241,7 @@
margin-top: 20rpx;
width: 600rpx;
font-size: 32rpx;
background-color: $main-color;
background-color: $mian-color;
text-align: center;
}
}

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

@@ -6,6 +6,7 @@
<view class="order-list" v-for="(item,index) in lists" :key="index">
<NumberWeightTemplate :item="item" />
<view class="actions">
<view @click="navMarkets(item.symbol)" class="nowPay">权证转让</view>
<view @click="nowTake(item.symbol)" class="nowPay">去提货</view>
</view>
</view>
@@ -129,8 +130,8 @@
}
.nav-item-selected {
border-bottom: solid 4rpx $main-color;
color: $main-color;
border-bottom: solid 4rpx $mian-color;
color: $mian-color;
}
}
@@ -161,7 +162,7 @@
border-radius: 40rpx;
margin-left: 20rpx;
margin-top: 20rpx;
background-color: $main-color;
background-color: $mian-color;
}
.cancelOrder {
@@ -173,7 +174,7 @@
}
.logistics {
background-color: $main-color;
background-color: $mian-color;
padding: 10rpx 30rpx;
border-radius: 40rpx;
margin-left: 20rpx;
@@ -189,7 +190,7 @@
}
.evaluate {
background-color: $main-color;
background-color: $mian-color;
padding: 10rpx 30rpx;
border-radius: 40rpx;
margin-left: 20rpx;

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

@@ -306,7 +306,7 @@
.order-status {
width: 100%;
height: 300rpx;
background-image: linear-gradient(to bottom, $main-color, $main-color-light);
background-image: linear-gradient(to bottom, $mian-color, $mian-color-light);
color: #Fff;
font-size: 36rpx;
padding: 30rpx 50rpx;
@@ -338,7 +338,7 @@
.acceptInfo {
margin: 0 30rpx;
background-color: #fff;
box-shadow: 0 0 14rpx 4rpx rgba($color: $main-color, $alpha: 0.2);
box-shadow: 0 0 14rpx 4rpx rgba($color: $mian-color, $alpha: 0.2);
border-radius: 20rpx;
padding: 30rpx;
position: relative;
@@ -498,7 +498,7 @@
justify-content: flex-end;
box-sizing: border-box;
font-size: 26rpx;
color: $main-color;
color: $mian-color;
flex: 1;
text-align: right;
margin-top: 20rpx;
@@ -506,7 +506,7 @@
}
.total-btn {
border: solid 1rpx $main-color;
border: solid 1rpx $mian-color;
padding: 6rpx 20rpx;
border-radius: 10rpx;
}
@@ -532,7 +532,7 @@
margin-top: 20rpx;
width: 600rpx;
font-size: 32rpx;
background-color: $main-color;
background-color: $mian-color;
text-align: center;
}
@@ -545,7 +545,7 @@
}
.logistics {
background-color: $main-color;
background-color: $mian-color;
padding: 10rpx 30rpx;
border-radius: 40rpx;
margin-left: 20rpx;
@@ -561,7 +561,7 @@
}
.evaluate {
background-color: $main-color;
background-color: $mian-color;
padding: 10rpx 30rpx;
border-radius: 40rpx;
margin-left: 20rpx;
@@ -579,7 +579,7 @@
width: 100%;
.copy {
color: $main-color;
color: $mian-color;
font-size: $title-size*0.8;
font-weight: 400;
padding: 0 30rpx;
@@ -684,8 +684,8 @@
}
.list-top-right {
border: solid 1rpx $main-color;
color: $main-color;
border: solid 1rpx $mian-color;
color: $mian-color;
display: inline-block;
padding: 8rpx 16rpx;
font-size: $title-size *0.8;

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

@@ -162,8 +162,8 @@
}
.nav-item-selected {
border-bottom: solid 4rpx $main-color;
color: $main-color;
border-bottom: solid 4rpx $mian-color;
color: $mian-color;
}
}
@@ -193,7 +193,7 @@
border-radius: 40rpx;
margin-left: 20rpx;
margin-top: 20rpx;
// background-color: $main-color;
// background-color: $mian-color;
color: #999;
border:solid 1rpx #cacaca;
}
@@ -207,7 +207,7 @@
}
.logistics {
background-color: $main-color;
background-color: $mian-color;
padding: 10rpx 30rpx;
border-radius: 40rpx;
margin-left: 20rpx;
@@ -223,7 +223,7 @@
}
.evaluate {
background-color: $main-color;
background-color: $mian-color;
padding: 10rpx 30rpx;
border-radius: 40rpx;
margin-left: 20rpx;

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

@@ -160,7 +160,7 @@
.order-status {
width: 100%;
height: 300rpx;
background-image: linear-gradient(to bottom, $main-color, $main-color-light);
background-image: linear-gradient(to bottom, $mian-color, $mian-color-light);
color: #Fff;
font-size: 36rpx;
padding: 30rpx 50rpx;
@@ -192,7 +192,7 @@
.acceptInfo {
margin: 0 30rpx;
background-color: #fff;
box-shadow: 0 0 14rpx 4rpx rgba($color: $main-color, $alpha: 0.2);
box-shadow: 0 0 14rpx 4rpx rgba($color: $mian-color, $alpha: 0.2);
border-radius: 20rpx;
padding: 30rpx;
position: relative;
@@ -362,7 +362,7 @@
justify-content: flex-end;
box-sizing: border-box;
font-size: 26rpx;
color: $main-color;
color: $mian-color;
flex: 1;
text-align: right;
margin-top: 20rpx;
@@ -370,7 +370,7 @@
}
.total-btn {
border: solid 1rpx $main-color;
border: solid 1rpx $mian-color;
padding: 6rpx 20rpx;
border-radius: 10rpx;
}
@@ -395,7 +395,7 @@
border-radius: 40rpx;
margin-left: 20rpx;
margin-top: 20rpx;
// background-color: $main-color;
// background-color: $mian-color;
color: #999;
border: solid 1rpx #cacaca;
}
@@ -409,7 +409,7 @@
}
.logistics {
background-color: $main-color;
background-color: $mian-color;
padding: 10rpx 30rpx;
border-radius: 40rpx;
margin-left: 20rpx;
@@ -425,7 +425,7 @@
}
.evaluate {
background-color: $main-color;
background-color: $mian-color;
padding: 10rpx 30rpx;
border-radius: 40rpx;
margin-left: 20rpx;
@@ -444,7 +444,7 @@
width: 100%;
.copy {
color: $main-color;
color: $mian-color;
font-size: $title-size*0.8;
font-weight: 400;
padding: 0 30rpx;
@@ -579,8 +579,8 @@
}
.list-top-right {
border: solid 1rpx $main-color;
color: $main-color;
border: solid 1rpx $mian-color;
color: $mian-color;
display: inline-block;
padding: 8rpx 16rpx;
font-size: $title-size *0.8;

4
pages/vip/vip.vue
View File

@@ -176,7 +176,7 @@
path: ''
},
openCondition: {},
voucher: '', //弹窗展示得内容
voucher: '', //弹窗展示得内容
}
},
created() {
@@ -297,7 +297,7 @@
vipWechatPay(orderId, {
type: 'app'
}).then(res => {
let payConfig = JSON.parse(res)
let payConfig = JSON.parse(res)
cashierPay.pay('wxpay', payConfig).then(payRes => {
this.idenInfo()
})