燕成杰 / Bitcoin · 提交

转到一个项目

作者 燕成杰
提交 3474d13fb5309675e2ea7f364b5e3a892b8efe5a 2 个父辈 0d433813 177c9f36

合并分支 'yan' 到 'master' 

Yan



查看合并请求 !16
内嵌 并排对比
正在显示 14 个修改的文件 包含 99 行增加 和 75 行删除
... ... @@ -8,10 +8,10 @@
console.log(openId,'openid');
if(!openId && !e.query.code){
console.log('获取code');
getApp().authorization()
// getApp().authorization()
}else if(e.query.code) {
console.log(2);
getApp().getOpenid(e.query.code)
// getApp().getOpenid(e.query.code)
}
// else {
// uni.showModal({
... ...
... ... @@ -2,9 +2,9 @@
<view class="content">
<view class="logo">
<image src="/static/ic_logo.png" mode=""></image>
<view class="search">
<view class="tosear" @click="gosourch">
<input type="text" value="" placeholder="搜索" disabled="true"
<view class="search" @click="gosourch">
<view class="tosear" >
<input type="text" @click="gosourch" value="" placeholder="搜索" disabled="true"
placeholder-style="text-align: center;font-size: 28rpx; color: rgba(194,194,194,1);" />
<image src="/static/icon-search.png" mode=""></image>
</view>
... ... @@ -24,7 +24,7 @@
<text>{{item.name}}</text>
</view>
<view class="bar" @click="toallCate">
<image class="barimg" src="/static/logo.png" mode=""></image>
<image class="barimg" src="/static/more.png" mode=""></image>
<text>更多</text>
</view>
</view>
... ... @@ -46,7 +46,7 @@
<view class="rightbox" @click="torealtime(2)">
<view class="righttitle">
<view class="title">
相关资讯
热门活动
</view>
<view class="active">
充值活动
... ... @@ -81,7 +81,7 @@
</view>
</view>
<view class="misslist">
<custom-waterfalls-flow :value="list" @wapperClick="godetail">
<custom-waterfalls-flow :value="list" @wapperClick="godetail" @imageClick="godetail">
<template v-slot:default="item">
<view class="item">
<view class="title">{{item.name}}</view>
... ... @@ -122,11 +122,7 @@
data() {
return {
title: 'Hello',
list1: [
'https://cdn.uviewui.com/uview/swiper/swiper1.png',
'https://cdn.uviewui.com/uview/swiper/swiper2.png',
'https://cdn.uviewui.com/uview/swiper/swiper3.png',
],
list1: [],
nevlist: [1, 2, 3, 4, , 6, 7],
leftlist: [1, 2, 3],
fallindex: 1,
... ... @@ -224,10 +220,10 @@
this.idgroup.push(item.id)
})
if (res.list.data.length == 0) {
uni.showToast({
title: "暂无更多数据",
icon: 'none'
})
// uni.showToast({
// title: "暂无更多数据",
// icon: 'none'
// })
return
}
console.log('产品列表', this.list)
... ... @@ -549,7 +545,8 @@
.tip {
position: absolute;
bottom: 0;
right: 0;
right: 50%;
transform: translateX(50%);
width: 64rpx;
height: 12rpx;
border-radius: 14rpx;
... ...
... ... @@ -10,10 +10,11 @@
<image src="../../static/icon-search.png" mode="" v-if="!keyword"></image>
</view>
</view>
</view>
<scroll-view scroll-y="true" @scrolltolower="scrolltolower" style="height: 100vh">
</view>
<u-empty marginTop ="200" mode="data" v-if="!list.length"></u-empty>
<scroll-view v-if="list.length" scroll-y="true" @scrolltolower="scrolltolower" style="height: 100vh">
<view class="misslist">
<custom-waterfalls-flow :value="list" @wapperClick="godetail">
<custom-waterfalls-flow :value="list" @wapperClick="godetail" @imageClick="godetail">
<template v-slot:default="item">
<view class="item">
<view class="title">{{item.name}}</view>
... ... @@ -30,7 +31,8 @@
</template>
</custom-waterfalls-flow>
</view>
</scroll-view>
</scroll-view>
</view>
</template>
... ... @@ -51,7 +53,10 @@
this.keyword = options.ktext
this.product_list(true)
},
methods: {
methods: {
gosourch(){
this.product_list(true)
},
scrolltolower() {
this.currentpage++
this.product_list()
... ... @@ -76,10 +81,10 @@
item.image = item.images_preview[0]
})
if (res.list.data.length == 0) {
uni.showToast({
title: "暂无更多数据",
icon: 'none'
})
// uni.showToast({
// title: "暂无更多数据",
// icon: 'none'
// })
return
}
console.log('产品列表', this.list)
... ... @@ -91,6 +96,13 @@
})
console.log('product_list', err)
}
},
//跳转详情
godetail(item) {
console.log(1)
uni.navigateTo({
url: "/pages/index/detail?id=" + item.id
})
},
}
}
... ...
... ... @@ -14,7 +14,7 @@
<view class="beforename">
身份证号：
</view>
<input type="number" v-model="number" maxlength="18" placeholder="请输入">
<input type="number" v-model="text" maxlength="18" placeholder="请输入">
</view>
<view class="imgbar">
<view class="mytitle">身份证照片 </view>
... ...
... ... @@ -80,7 +80,7 @@
async sort_list() {
console.log(this.type,"000")
let obj = {
type:1,
type:2,
keyword: this.keyword,
}
try {
... ... @@ -114,10 +114,10 @@
this.sortlist = x ? res.list.data : this.sortlist.concat(res.list.data)
console.log('arc_list', res)
if (res.list.data.length == 0) {
uni.showToast({
title: "暂无更多数据",
icon: 'none'
})
// uni.showToast({
// title: "暂无更多数据",
// icon: 'none'
// })
return
}
// 保存数据
... ...
... ... @@ -3,7 +3,7 @@
<u-search :showAction="true" actionText="搜索" :clearabled="true" v-model="ktext" @custom="onsouch(ktext)">
</u-search>
<view class="main">
<view class="title">
<view class="title" v-if="hostlist.length">
<text>历史搜索</text>
<image src="../../static/ic-delete-false.png" mode="" @click="delhostily"></image>
</view>
... ... @@ -55,7 +55,8 @@
//清除历史搜索记录
async search_clear() {
try {
const res = await search_clear()
const res = await search_clear()
this.search_list()
console.log('search_clear', res)
// 保存数据
} catch (err) {
... ...
... ... @@ -112,25 +112,8 @@
提交
</view>
</view>
<u-popup :show="show" @close="close" @open="open" mode="center" :round="12">
<view class="popname">
<view class="title">
实名认证
</view>
<view class="contant">
为了保证平台用户交易的安全性，您需要实名认证后，才能在平台中进行发布物品操作
</view>
<view class="btngroup" >
<view class="concle" @click="show=false">
暂不认证
</view>
<view class="requt" @click="goRealName">
立即认证
</view>
</view>
</view>
</u-popup>
<u-popup :show="showmoney" @close="close" @open="open" mode="center" :round="12">
<u-popup :show="showmoney" :closeOnClickOverlay="false" @close="close" @open="open" mode="center" :round="12">
<view class="popname">
<view class="title">
缴纳保证金
... ... @@ -147,6 +130,24 @@
</view>
</view>
</view>
</u-popup>
<u-popup :show="show" :closeOnClickOverlay="false" @close="close" @open="open" mode="center" :round="12">
<view class="popname">
<view class="title">
实名认证
</view>
<view class="contant">
为了保证平台用户交易的安全性，您需要实名认证后，才能在平台中进行发布物品操作
</view>
<view class="btngroup" >
<view class="concle" @click="back">
暂不认证
</view>
<view class="requt" @click="goRealName">
立即认证
</view>
</view>
</view>
</u-popup>
</view>
... ... @@ -336,9 +337,11 @@
try {
const res = await getLastInfo()
this.lastInfo = res.detail
if(res.detail.is_cert==0){ this.show = true}
console.log(1);
if(res.detail.is_cert==0){ return this.show = true}
if(res.detail.is_cert_withdraw!=1 && !this.code){ this.showmoney = true}
console.log(2);
console.log(res.detail.is_cert_withdraw!=1,!this.code);
if(res.detail.is_cert_withdraw!=1 && !this.code){ this.showmoney = true}
this.form.seller_mobile = res.detail.seller_mobile
this.form.seller_name = res.detail.seller_name
this.form.package_add = res.detail.package_add
... ... @@ -413,8 +416,8 @@
// 发布
send(){
console.log(this.lastInfo);
if(this.lastInfo.is_cert==0) return this.show = true
if(this.lastInfo.is_cert_withdraw!=1 ) return this.showmoney = true
if(this.lastInfo.is_cert==0) return this.show = true
if(this.fileList1.length){
this.form.images = this.fileList1.map(it=>it.shortUrl).join(',')
}
... ...
... ... @@ -16,7 +16,7 @@
密码：
</view>
<view class="last name">
<input v-model="password" maxlength="16" type="password" value="" placeholder="密码：" />
<input v-model="password" maxlength="16" type="password" value="" placeholder="请输入密码" />
</view>
</view>
<view class="loginbtn" @click="doLogin">
... ...
... ... @@ -82,7 +82,10 @@
setTimeout(()=>{
toa.success('反馈成功')
},200)
uni.navigateBack({})
// uni.navigateBack({})
uni.reLaunch({
url:'/pages/mine/mine'
})
// 保存数据
} catch (err) {
uni.showToast({
... ... @@ -132,6 +135,7 @@
height: 200rpx;
}
.close {
z-index: 1;
width: 36rpx;
height: 36rpx;
position: absolute;
... ...
... ... @@ -11,7 +11,7 @@
<image src="/static/order.png" mode=""></image>
<view>订单号：</view>
<view style="margin: 0 16rpx 0 8rpx">{{item.order_no}}</view>
<view style="color:#2153D4;" @click="copy(item.order_no)">复制</view>
<view style="color:#2153D4;" @click.stop="copy(item.order_no)">复制</view>
</view>
<view class="right">
<text v-if="item.status==1">待支付</text>
... ... @@ -55,7 +55,7 @@
<view class="popTitle">
转赠证明
</view>
<image class="popImage" :src="showimg" mode=""></image>
<image class="popImage" :src="showimg" mode="scaleToFill"></image>
<view class="popBtn flexA">
<view class="btn flexC" v-if="reChest(showstatus)" @click="order_confirm(showid,showindex,2)">未收货
</view>
... ...
... ... @@ -17,7 +17,7 @@
<view class="desc flexA">
{{item.seller_name}}
<view class="money">
<text style="font-size: 20rpx;">¥</text>120
<text style="font-size: 20rpx;">¥</text>{{item.price}}
</view>
</view>
</view>
... ...
... ... @@ -10,7 +10,7 @@
<image src="/static/order.png" mode=""></image>
<view>订单号：</view>
<view style="margin: 0 16rpx 0 8rpx">{{item.order_no}}</view>
<view style="color:#2153D4;" @click="copy(item.order_no)">复制</view>
<view style="color:#2153D4;" @click.stop="copy(item.order_no)">复制</view>
</view>
<view class="right">
<text v-if="item.status==1">待支付</text>
... ... @@ -44,10 +44,10 @@
<view class="line"></view>
<view class="botBtn flexA">
<view v-if="reseller(item.status)" class="flexC" @click.stop="openshowBuyer(item)">买家信息</view>
<view v-if="!item.license_preview&&(item.status==2||item.status==3)" class="flexC" @click.stop="openimag(item.id,idx)">上传转赠证明</view>
<view v-if="reseller(item.status)" class="flexC" @click.stop="order_send(item.id,idx)">发货</view>
<view v-if="!item.license_preview&&(item.status==2||item.status==3)" class="flexC yellow" @click.stop="openimag(item.id,idx,1)">上传转赠证明</view>
<view v-if="item.license_preview" class="flexC yellow" @click.stop="openshow(item.license_preview)">查看交易证明</view>
<view v-if="item.license_preview" class="flexC yellow" @click.stop="openimag(item.id,idx)">重新上传证明</view>
<view v-if="item.license_preview" class="flexC yellow" @click.stop="openimag(item.id,idx,2)">重新上传证明</view>
</view>
</view>
</view>
... ... @@ -56,7 +56,7 @@
<view class="popTitle">
转赠证明
</view>
<image class="popImage" :src="licenimg" mode=""></image>
<image class="popImage" :src="licenimg" mode="scaleToFill"></image>
<view class="popBtn flexC">
<view class="btn flexC" @click="show=false">确定</view>
</view>
... ... @@ -68,27 +68,27 @@
<view class="buyerTitle">
买家信息
</view>
<view class="list flexA">
<view class="list flexA" v-if="code">
<view class="left"><text style="color: #FC4338;">*</text>接收账户：</view>
<view class="right flexA">
<view class="fw700">{{code}}</view>
<view style="margin-left: 16rpx;color: rgba(0,0,0,0.4);" @click="copy(code)">复制</view>
<view style="margin-left: 16rpx;color: rgba(0,0,0,0.4);" @click.stop="copy(code)">复制</view>
</view>
</view>
<view class="list flexA">
<view class="left"><text style="color: #FC4338;">*</text>微信号：</view>
<view class="right flexA">
<view class="fw700">{{wechart}}</view>
<view style="margin-left: 16rpx;color: rgba(0,0,0,0.4);" @click="copy(code)">复制</view>
<view style="margin-left: 16rpx;color: rgba(0,0,0,0.4);" @click.stop="copy(wechart)">复制</view>
</view>
</view>
<view class="list flexA">
<view class="list flexA" v-if="name">
<view class="left">联系人：</view>
<view class="right flexA">
<view class="fw700">{{name}}</view>
</view>
</view>
<view class="list flexA">
<view class="list flexA" v-if="phone">
<view class="left">联系电话：</view>
<view class="right flexA">
<view class="fw700">{{phone}}</view>
... ... @@ -176,7 +176,7 @@
console.log(this.licenimg)
},
//上传证明
openimag(id, imgindex) {
openimag(id, imgindex,type) {
let that = this
that.imgid = id
that.imgindex = imgindex
... ... @@ -193,6 +193,9 @@
token: uni.getStorageSync('token')
},
success: (uploadFileRes) => {
uni.showToast({
title:type==1?'上传证明成功':'重新上传证明成功'
})
let data = JSON.parse(uploadFileRes.data);
console.log(data);
that.licenimg = data.data.fullurl; // 绝对路径
... ... @@ -388,10 +391,11 @@
justify-content: flex-end;
view {
box-sizing: border-box;
margin-right: 24rpx;
color: rgba(0, 0, 0, 0.6);
font-size: 24rpx;
padding: 12rpx 36rpx;
padding: 12rpx 14rpx;
// width: 144rpx;
height: 56rpx;
border-radius: 12rpx;
... ... @@ -405,6 +409,9 @@
border-color: rgba(254, 208, 0, 1);
color: rgba(0, 0, 0, 0.9);
}
.yellow:nth-last-child(1){
margin-right: 0;
}
}
.centerBox {
... ... @@ -454,7 +461,7 @@
padding: 32rpx 32rpx;
box-sizing: border-box;
width: 622rpx;
height: 392rpx;
// height: 392rpx;
border-radius: 24rpx;
background: rgba(255, 255, 255, 1);
... ...
<!DOCTYPE html><html lang=zh-CN><head><meta charset=utf-8><meta http-equiv=X-UA-Compatible content="IE=edge"><title>元届印象</title><script>var coverSupport = 'CSS' in window && typeof CSS.supports === 'function' && (CSS.supports('top: env(a)') || CSS.supports('top: constant(a)'))
document.write('<meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0' + (coverSupport ? ', viewport-fit=cover' : '') + '" />')</script><link rel=stylesheet href=/static/index.a5c69d49.css></head><body><noscript><strong>Please enable JavaScript to continue.</strong></noscript><div id=app></div><script src=/static/js/chunk-vendors.f3bf79df.js></script><script src=/static/js/index.6b7d1d69.js></script></body></html>
\ No newline at end of file
document.write('<meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0' + (coverSupport ? ', viewport-fit=cover' : '') + '" />')</script><link rel=stylesheet href=/static/index.a5c69d49.css></head><body><noscript><strong>Please enable JavaScript to continue.</strong></noscript><div id=app></div><script src=/static/js/chunk-vendors.f3bf79df.js></script><script src=/static/js/index.c5ea6188.js></script></body></html>
\ No newline at end of file
... ...