燕成杰 / Bitcoin · 提交

转到一个项目

作者 卢胜
提交 69c653bbaf92e49a547e9c26bc2213dc4c50232a 2 个父辈 d22da9dc 3474d13f

电话

内嵌 并排对比
正在显示 14 个修改的文件 包含 242 行增加 和 195 行删除
1 <script> 1 <script>
2 - var wx = require('jweixin-module')  
3 - import {authorization,getOpenid } from '@/api/send'  
4 - export default {  
5 - // http://localhost:8080/  
6 - onLaunch: function(e) {  
7 - const openId = uni.getStorageSync('openId')  
8 - console.log(openId);  
9 - if(!openId && !e.query.code){  
10 - // getApp().authorization()  
11 - }else if(e.query.code) {  
12 - console.log(2);  
13 - // getApp().getOpenid(e.query.code)  
14 - }  
15 - // else {  
16 - // uni.showModal({  
17 - // content: 'open:'+openId + 'code:'+e.query.code,  
18 - // showCancel: false  
19 - // });  
20 - // }  
21 - console.log(e.query.code);  
22 - console.log('App Launch')  
23 - },  
24 - onShow: function() {  
25 - console.log('App Show')  
26 - },  
27 - onHide: function() {  
28 - console.log('App Hide')  
29 - },  
30 - methods: {  
31 - // 拿code  
32 - async authorization(){  
33 - try {  
34 - const res = await authorization(window.location.href)  
35 - console.log('authorization', res)  
36 - window.location.href = res.url  
37 - // 保存数据  
38 - } catch (err) {  
39 - uni.showToast({ title:err,icon:'none' })  
40 - console.log('authorization', err)  
41 - }  
42 - },  
43 - // 获取openid  
44 - async getOpenid(code){  
45 - try {  
46 - const res = await getOpenid(code)  
47 - console.log('getOpenid', res)  
48 - uni.setStorageSync('openId',res.openid)  
49 - // 保存数据  
50 - } catch (err) {  
51 - setTimeout(()=>{  
52 - uni.showToast({ title:err,icon:'none' })  
53 - },300)  
54 - uni.redirectTo({  
55 - url:'/pages/index/index'  
56 - })  
57 - console.log('getOpenid', err)  
58 - }  
59 - },  
60 - },  
61 - } 2 + var wx = require('jweixin-module')
  3 + import {
  4 + authorization,
  5 + getOpenid
  6 + } from '@/api/send'
  7 + export default {
  8 + // http://localhost:8080/
  9 + onLaunch: function(e) {
  10 + const openId = uni.getStorageSync('openId')
  11 +
  12 + if (!openId && !e.query.code) {
  13 + console.log('获取code');
  14 + getApp().authorization()
  15 + } else if (e.query.code) {
  16 + console.log(2);
  17 + getApp().getOpenid(e.query.code)
  18 + }
  19 + // else {
  20 + // uni.showModal({
  21 + // content: 'open:'+openId + 'code:'+e.query.code,
  22 + // showCancel: false
  23 + // });
  24 + // }
  25 + console.log(e.query.code);
  26 + console.log('App Launch')
  27 + },
  28 + onShow: function() {
  29 + console.log('App Show')
  30 + },
  31 + onHide: function() {
  32 + console.log('App Hide')
  33 + },
  34 + methods: {
  35 + // 拿code
  36 + async authorization() {
  37 + try {
  38 + const res = await authorization(window.location.href)
  39 + console.log('authorization', res)
  40 + window.location.href = res.url
  41 + // 保存数据
  42 + } catch (err) {
  43 + uni.showToast({
  44 + title: err,
  45 + icon: 'none'
  46 + })
  47 + console.log('authorization', err)
  48 + }
  49 + },
  50 + // 获取openid
  51 + async getOpenid(code) {
  52 + try {
  53 + const res = await getOpenid(code)
  54 + console.log('getOpenid', res)
  55 + uni.setStorageSync('openId', res.openid)
  56 + // 保存数据
  57 + } catch (err) {
  58 + setTimeout(() => {
  59 + uni.showToast({
  60 + title: err,
  61 + icon: 'none'
  62 + })
  63 + }, 300)
  64 + uni.redirectTo({
  65 + url: '/pages/index/index'
  66 + })
  67 + console.log('getOpenid', err)
  68 + }
  69 + },
  70 + },
  71 + }
62 </script> 72 </script>
63 73
64 <style lang="scss"> 74 <style lang="scss">
65 - /* 注意要写在第一行，同时给style标签加入lang="scss"属性 */  
66 - @import "uview-ui/index.scss";  
67 - uni-page-head {  
68 - display:none !important;  
69 - }  
70 - /*每个页面公共css */  
71 - .wh100 {  
72 - width: 100%;  
73 - height: 100%;  
74 - }  
75 -  
76 - .flexC {  
77 - display: flex;  
78 - justify-content: center;  
79 - align-items: center;  
80 - }  
81 - .flexD {  
82 - display: flex;  
83 - justify-content: space-between;  
84 - align-items: center;  
85 - }  
86 -  
87 - .flex {  
88 - display: flex;  
89 - }  
90 -  
91 - .flexA {  
92 - display: flex;  
93 - align-items: center;  
94 - }  
95 -  
96 - .fw700 {  
97 - font-weight: 700;  
98 - }  
99 -  
100 - .flexwrap {  
101 - display: flex;  
102 - flex-wrap: wrap;  
103 - align-items: center;  
104 - }  
105 -  
106 - .flexcolum {  
107 - display: flex;  
108 - flex-direction: column;  
109 - justify-content: center;  
110 - align-items: center;  
111 - }  
112 -  
113 - .serviceBtn {  
114 - opacity: 0;  
115 - position: absolute;  
116 - left: 0;  
117 - bottom: 0;  
118 - width: 120rpx;  
119 - height: 120rpx;  
120 - } 75 + /* 注意要写在第一行，同时给style标签加入lang="scss"属性 */
  76 + @import "uview-ui/index.scss";
  77 +
  78 + uni-page-head {
  79 + display: none !important;
  80 + }
  81 +
  82 + /*每个页面公共css */
  83 + .wh100 {
  84 + width: 100%;
  85 + height: 100%;
  86 + }
  87 +
  88 + .flexC {
  89 + display: flex;
  90 + justify-content: center;
  91 + align-items: center;
  92 + }
  93 +
  94 + .flexD {
  95 + display: flex;
  96 + justify-content: space-between;
  97 + align-items: center;
  98 + }
  99 +
  100 + .flex {
  101 + display: flex;
  102 + }
  103 +
  104 + .flexA {
  105 + display: flex;
  106 + align-items: center;
  107 + }
  108 +
  109 + .fw700 {
  110 + font-weight: 700;
  111 + }
  112 +
  113 + .flexwrap {
  114 + display: flex;
  115 + flex-wrap: wrap;
  116 + align-items: center;
  117 + }
  118 +
  119 + .flexcolum {
  120 + display: flex;
  121 + flex-direction: column;
  122 + justify-content: center;
  123 + align-items: center;
  124 + }
  125 +
  126 + .serviceBtn {
  127 + opacity: 0;
  128 + position: absolute;
  129 + left: 0;
  130 + bottom: 0;
  131 + width: 120rpx;
  132 + height: 120rpx;
  133 + }
121 </style> 134 </style>
122 <style> 135 <style>
123 -  
124 - /*每个页面公共css */  
125 -</style>  
  136 + /*每个页面公共css */
  137 +</style>
@@ -2,9 +2,9 @@ @@ -2,9 +2,9 @@
2 <view class="content"> 2 <view class="content">
3 <view class="logo"> 3 <view class="logo">
4 <image src="/static/ic_logo.png" mode=""></image> 4 <image src="/static/ic_logo.png" mode=""></image>
5 - <view class="search">  
6 - <view class="tosear" @click="gosourch">  
7 - <input type="text" value="" placeholder="搜索" disabled="true" 5 + <view class="search" @click="gosourch">
  6 + <view class="tosear" >
  7 + <input type="text" @click="gosourch" value="" placeholder="搜索" disabled="true"
8 placeholder-style="text-align: center;font-size: 28rpx; color: rgba(194,194,194,1);" /> 8 placeholder-style="text-align: center;font-size: 28rpx; color: rgba(194,194,194,1);" />
9 <image src="/static/icon-search.png" mode=""></image> 9 <image src="/static/icon-search.png" mode=""></image>
10 </view> 10 </view>
@@ -19,12 +19,12 @@ @@ -19,12 +19,12 @@
19 </view> 19 </view>
20 <view class="contail"> 20 <view class="contail">
21 <view class="nev"> 21 <view class="nev">
22 - <view class="bar" v-for="(item,index) in categoryList" :key="index" @click="tocate"> 22 + <view class="bar" v-for="(item,index) in categoryList" :key="index" @click="tocate(item.name)">
23 <image class="barimg" :src="item.image_preview" mode=""></image> 23 <image class="barimg" :src="item.image_preview" mode=""></image>
24 <text>{{item.name}}</text> 24 <text>{{item.name}}</text>
25 </view> 25 </view>
26 - <view class="bar">  
27 - <image class="barimg" src="/static/logo.png" mode=""></image> 26 + <view class="bar" @click="toallCate">
  27 + <image class="barimg" src="/static/more.png" mode=""></image>
28 <text>更多</text> 28 <text>更多</text>
29 </view> 29 </view>
30 </view> 30 </view>
@@ -46,7 +46,7 @@ @@ -46,7 +46,7 @@
46 <view class="rightbox" @click="torealtime(2)"> 46 <view class="rightbox" @click="torealtime(2)">
47 <view class="righttitle"> 47 <view class="righttitle">
48 <view class="title"> 48 <view class="title">
49 - 相关资讯 49 + 热门活动
50 </view> 50 </view>
51 <view class="active"> 51 <view class="active">
52 充值活动 52 充值活动
@@ -81,7 +81,7 @@ @@ -81,7 +81,7 @@
81 </view> 81 </view>
82 </view> 82 </view>
83 <view class="misslist"> 83 <view class="misslist">
84 - <custom-waterfalls-flow :value="list" @wapperClick="godetail"> 84 + <custom-waterfalls-flow :value="list" @wapperClick="godetail" @imageClick="godetail">
85 <template v-slot:default="item"> 85 <template v-slot:default="item">
86 <view class="item"> 86 <view class="item">
87 <view class="title">{{item.name}}</view> 87 <view class="title">{{item.name}}</view>
@@ -122,11 +122,7 @@ @@ -122,11 +122,7 @@
122 data() { 122 data() {
123 return { 123 return {
124 title: 'Hello', 124 title: 'Hello',
125 - list1: [  
126 - 'https://cdn.uviewui.com/uview/swiper/swiper1.png',  
127 - 'https://cdn.uviewui.com/uview/swiper/swiper2.png',  
128 - 'https://cdn.uviewui.com/uview/swiper/swiper3.png',  
129 - ], 125 + list1: [],
130 nevlist: [1, 2, 3, 4, , 6, 7], 126 nevlist: [1, 2, 3, 4, , 6, 7],
131 leftlist: [1, 2, 3], 127 leftlist: [1, 2, 3],
132 fallindex: 1, 128 fallindex: 1,
@@ -157,7 +153,12 @@ @@ -157,7 +153,12 @@
157 url: "/pages/index/consultationDetails?id=" + e 153 url: "/pages/index/consultationDetails?id=" + e
158 }) 154 })
159 }, 155 },
160 - tocate() { 156 + tocate(name) {
  157 + uni.navigateTo({
  158 + url: "/pages/index/product?ktext="+name
  159 + })
  160 + },
  161 + toallCate(){
161 uni.navigateTo({ 162 uni.navigateTo({
162 url: "/pages/index/category" 163 url: "/pages/index/category"
163 }) 164 })
@@ -219,10 +220,10 @@ @@ -219,10 +220,10 @@
219 this.idgroup.push(item.id) 220 this.idgroup.push(item.id)
220 }) 221 })
221 if (res.list.data.length == 0) { 222 if (res.list.data.length == 0) {
222 - uni.showToast({  
223 - title: "暂无更多数据",  
224 - icon: 'none'  
225 - }) 223 + // uni.showToast({
  224 + // title: "暂无更多数据",
  225 + // icon: 'none'
  226 + // })
226 return 227 return
227 } 228 }
228 console.log('产品列表', this.list) 229 console.log('产品列表', this.list)
@@ -543,8 +544,10 @@ @@ -543,8 +544,10 @@
543 544
544 .tip { 545 .tip {
545 position: absolute; 546 position: absolute;
546 - bottom: -6rpx;  
547 - right: 0; 547 + bottom: 0;
  548 + right: 50%;
  549 + transform: translateX(50%);
  550 +
548 width: 64rpx; 551 width: 64rpx;
549 height: 12rpx; 552 height: 12rpx;
550 border-radius: 14rpx; 553 border-radius: 14rpx;
@@ -10,10 +10,11 @@ @@ -10,10 +10,11 @@
10 <image src="../../static/icon-search.png" mode="" v-if="!keyword"></image> 10 <image src="../../static/icon-search.png" mode="" v-if="!keyword"></image>
11 </view> 11 </view>
12 </view> 12 </view>
13 - </view>  
14 - <scroll-view scroll-y="true" @scrolltolower="scrolltolower" style="height: 100vh"> 13 + </view>
  14 + <u-empty marginTop ="200" mode="data" v-if="!list.length"></u-empty>
  15 + <scroll-view v-if="list.length" scroll-y="true" @scrolltolower="scrolltolower" style="height: 100vh">
15 <view class="misslist"> 16 <view class="misslist">
16 - <custom-waterfalls-flow :value="list" @wapperClick="godetail"> 17 + <custom-waterfalls-flow :value="list" @wapperClick="godetail" @imageClick="godetail">
17 <template v-slot:default="item"> 18 <template v-slot:default="item">
18 <view class="item"> 19 <view class="item">
19 <view class="title">{{item.name}}</view> 20 <view class="title">{{item.name}}</view>
@@ -30,7 +31,8 @@ @@ -30,7 +31,8 @@
30 </template> 31 </template>
31 </custom-waterfalls-flow> 32 </custom-waterfalls-flow>
32 </view> 33 </view>
33 - </scroll-view> 34 + </scroll-view>
  35 +
34 </view> 36 </view>
35 </template> 37 </template>
36 38
@@ -51,7 +53,10 @@ @@ -51,7 +53,10 @@
51 this.keyword = options.ktext 53 this.keyword = options.ktext
52 this.product_list(true) 54 this.product_list(true)
53 }, 55 },
54 - methods: { 56 + methods: {
  57 + gosourch(){
  58 + this.product_list(true)
  59 + },
55 scrolltolower() { 60 scrolltolower() {
56 this.currentpage++ 61 this.currentpage++
57 this.product_list() 62 this.product_list()
@@ -76,10 +81,10 @@ @@ -76,10 +81,10 @@
76 item.image = item.images_preview[0] 81 item.image = item.images_preview[0]
77 }) 82 })
78 if (res.list.data.length == 0) { 83 if (res.list.data.length == 0) {
79 - uni.showToast({  
80 - title: "暂无更多数据",  
81 - icon: 'none'  
82 - }) 84 + // uni.showToast({
  85 + // title: "暂无更多数据",
  86 + // icon: 'none'
  87 + // })
83 return 88 return
84 } 89 }
85 console.log('产品列表', this.list) 90 console.log('产品列表', this.list)
@@ -91,6 +96,13 @@ @@ -91,6 +96,13 @@
91 }) 96 })
92 console.log('product_list', err) 97 console.log('product_list', err)
93 } 98 }
  99 + },
  100 + //跳转详情
  101 + godetail(item) {
  102 + console.log(1)
  103 + uni.navigateTo({
  104 + url: "/pages/index/detail?id=" + item.id
  105 + })
94 }, 106 },
95 } 107 }
96 } 108 }
@@ -14,7 +14,7 @@ @@ -14,7 +14,7 @@
14 <view class="beforename"> 14 <view class="beforename">
15 身份证号： 15 身份证号：
16 </view> 16 </view>
17 - <input type="number" v-model="number" maxlength="18" placeholder="请输入"> 17 + <input type="number" v-model="text" maxlength="18" placeholder="请输入">
18 </view> 18 </view>
19 <view class="imgbar"> 19 <view class="imgbar">
20 <view class="mytitle">身份证照片 </view> 20 <view class="mytitle">身份证照片 </view>
@@ -80,7 +80,7 @@ @@ -80,7 +80,7 @@
80 async sort_list() { 80 async sort_list() {
81 console.log(this.type,"000") 81 console.log(this.type,"000")
82 let obj = { 82 let obj = {
83 - type:1, 83 + type:2,
84 keyword: this.keyword, 84 keyword: this.keyword,
85 } 85 }
86 try { 86 try {
@@ -114,10 +114,10 @@ @@ -114,10 +114,10 @@
114 this.sortlist = x ? res.list.data : this.sortlist.concat(res.list.data) 114 this.sortlist = x ? res.list.data : this.sortlist.concat(res.list.data)
115 console.log('arc_list', res) 115 console.log('arc_list', res)
116 if (res.list.data.length == 0) { 116 if (res.list.data.length == 0) {
117 - uni.showToast({  
118 - title: "暂无更多数据",  
119 - icon: 'none'  
120 - }) 117 + // uni.showToast({
  118 + // title: "暂无更多数据",
  119 + // icon: 'none'
  120 + // })
121 return 121 return
122 } 122 }
123 // 保存数据 123 // 保存数据
@@ -3,7 +3,7 @@ @@ -3,7 +3,7 @@
3 <u-search :showAction="true" actionText="搜索" :clearabled="true" v-model="ktext" @custom="onsouch(ktext)"> 3 <u-search :showAction="true" actionText="搜索" :clearabled="true" v-model="ktext" @custom="onsouch(ktext)">
4 </u-search> 4 </u-search>
5 <view class="main"> 5 <view class="main">
6 - <view class="title"> 6 + <view class="title" v-if="hostlist.length">
7 <text>历史搜索</text> 7 <text>历史搜索</text>
8 <image src="../../static/ic-delete-false.png" mode="" @click="delhostily"></image> 8 <image src="../../static/ic-delete-false.png" mode="" @click="delhostily"></image>
9 </view> 9 </view>
@@ -55,7 +55,8 @@ @@ -55,7 +55,8 @@
55 //清除历史搜索记录 55 //清除历史搜索记录
56 async search_clear() { 56 async search_clear() {
57 try { 57 try {
58 - const res = await search_clear() 58 + const res = await search_clear()
  59 + this.search_list()
59 console.log('search_clear', res) 60 console.log('search_clear', res)
60 // 保存数据 61 // 保存数据
61 } catch (err) { 62 } catch (err) {
@@ -112,25 +112,8 @@ @@ -112,25 +112,8 @@
112 提交 112 提交
113 </view> 113 </view>
114 </view> 114 </view>
115 - <u-popup :show="show" @close="close" @open="open" mode="center" :round="12">  
116 - <view class="popname">  
117 - <view class="title">  
118 - 实名认证  
119 - </view>  
120 - <view class="contant">  
121 - 为了保证平台用户交易的安全性，您需要实名认证后，才能在平台中进行发布物品操作  
122 - </view>  
123 - <view class="btngroup" >  
124 - <view class="concle" @click="show=false">  
125 - 暂不认证  
126 - </view>  
127 - <view class="requt" @click="goRealName">  
128 - 立即认证  
129 - </view>  
130 - </view>  
131 - </view>  
132 - </u-popup>  
133 - <u-popup :show="showmoney" @close="close" @open="open" mode="center" :round="12"> 115 +
  116 + <u-popup :show="showmoney" :closeOnClickOverlay="false" @close="close" @open="open" mode="center" :round="12">
134 <view class="popname"> 117 <view class="popname">
135 <view class="title"> 118 <view class="title">
136 缴纳保证金 119 缴纳保证金
@@ -147,6 +130,24 @@ @@ -147,6 +130,24 @@
147 </view> 130 </view>
148 </view> 131 </view>
149 </view> 132 </view>
  133 + </u-popup>
  134 + <u-popup :show="show" :closeOnClickOverlay="false" @close="close" @open="open" mode="center" :round="12">
  135 + <view class="popname">
  136 + <view class="title">
  137 + 实名认证
  138 + </view>
  139 + <view class="contant">
  140 + 为了保证平台用户交易的安全性，您需要实名认证后，才能在平台中进行发布物品操作
  141 + </view>
  142 + <view class="btngroup" >
  143 + <view class="concle" @click="back">
  144 + 暂不认证
  145 + </view>
  146 + <view class="requt" @click="goRealName">
  147 + 立即认证
  148 + </view>
  149 + </view>
  150 + </view>
150 </u-popup> 151 </u-popup>
151 </view> 152 </view>
152 153
@@ -336,9 +337,11 @@ @@ -336,9 +337,11 @@
336 try { 337 try {
337 const res = await getLastInfo() 338 const res = await getLastInfo()
338 this.lastInfo = res.detail 339 this.lastInfo = res.detail
339 - if(res.detail.is_cert==0){ this.show = true} 340 + console.log(1);
  341 + if(res.detail.is_cert==0){ return this.show = true}
  342 + if(res.detail.is_cert_withdraw!=1 && !this.code){ this.showmoney = true}
  343 + console.log(2);
340 console.log(res.detail.is_cert_withdraw!=1,!this.code); 344 console.log(res.detail.is_cert_withdraw!=1,!this.code);
341 - if(res.detail.is_cert_withdraw!=1 && !this.code){ this.showmoney = true}  
342 this.form.seller_mobile = res.detail.seller_mobile 345 this.form.seller_mobile = res.detail.seller_mobile
343 this.form.seller_name = res.detail.seller_name 346 this.form.seller_name = res.detail.seller_name
344 this.form.package_add = res.detail.package_add 347 this.form.package_add = res.detail.package_add
@@ -413,8 +416,8 @@ @@ -413,8 +416,8 @@
413 // 发布 416 // 发布
414 send(){ 417 send(){
415 console.log(this.lastInfo); 418 console.log(this.lastInfo);
416 - if(this.lastInfo.is_cert==0) return this.show = true  
417 if(this.lastInfo.is_cert_withdraw!=1 ) return this.showmoney = true 419 if(this.lastInfo.is_cert_withdraw!=1 ) return this.showmoney = true
  420 + if(this.lastInfo.is_cert==0) return this.show = true
418 if(this.fileList1.length){ 421 if(this.fileList1.length){
419 this.form.images = this.fileList1.map(it=>it.shortUrl).join(',') 422 this.form.images = this.fileList1.map(it=>it.shortUrl).join(',')
420 } 423 }
@@ -82,7 +82,10 @@ @@ -82,7 +82,10 @@
82 setTimeout(()=>{ 82 setTimeout(()=>{
83 toa.success('反馈成功') 83 toa.success('反馈成功')
84 },200) 84 },200)
85 - uni.navigateBack({}) 85 + // uni.navigateBack({})
  86 + uni.reLaunch({
  87 + url:'/pages/mine/mine'
  88 + })
86 // 保存数据 89 // 保存数据
87 } catch (err) { 90 } catch (err) {
88 uni.showToast({ 91 uni.showToast({
@@ -132,6 +135,7 @@ @@ -132,6 +135,7 @@
132 height: 200rpx; 135 height: 200rpx;
133 } 136 }
134 .close { 137 .close {
  138 + z-index: 1;
135 width: 36rpx; 139 width: 36rpx;
136 height: 36rpx; 140 height: 36rpx;
137 position: absolute; 141 position: absolute;
@@ -11,7 +11,7 @@ @@ -11,7 +11,7 @@
11 <image src="/static/order.png" mode=""></image> 11 <image src="/static/order.png" mode=""></image>
12 <view>订单号：</view> 12 <view>订单号：</view>
13 <view style="margin: 0 16rpx 0 8rpx">{{item.order_no}}</view> 13 <view style="margin: 0 16rpx 0 8rpx">{{item.order_no}}</view>
14 - <view style="color:#2153D4;" @click="copy(item.order_no)">复制</view> 14 + <view style="color:#2153D4;" @click.stop="copy(item.order_no)">复制</view>
15 </view> 15 </view>
16 <view class="right"> 16 <view class="right">
17 <text v-if="item.status==1">待支付</text> 17 <text v-if="item.status==1">待支付</text>
@@ -55,7 +55,7 @@ @@ -55,7 +55,7 @@
55 <view class="popTitle"> 55 <view class="popTitle">
56 转赠证明 56 转赠证明
57 </view> 57 </view>
58 - <image class="popImage" :src="showimg" mode=""></image> 58 + <image class="popImage" :src="showimg" mode="scaleToFill"></image>
59 <view class="popBtn flexA"> 59 <view class="popBtn flexA">
60 <view class="btn flexC" v-if="reChest(showstatus)" @click="order_confirm(showid,showindex,2)">未收货 60 <view class="btn flexC" v-if="reChest(showstatus)" @click="order_confirm(showid,showindex,2)">未收货
61 </view> 61 </view>
@@ -17,7 +17,7 @@ @@ -17,7 +17,7 @@
17 <view class="desc flexA"> 17 <view class="desc flexA">
18 {{item.seller_name}} 18 {{item.seller_name}}
19 <view class="money"> 19 <view class="money">
20 - <text style="font-size: 20rpx;">¥</text>120 20 + <text style="font-size: 20rpx;">¥</text>{{item.price}}
21 </view> 21 </view>
22 </view> 22 </view>
23 </view> 23 </view>
@@ -120,6 +120,7 @@ @@ -120,6 +120,7 @@
120 }, 120 },
121 toggle(e){ 121 toggle(e){
122 this.idx = e.index 122 this.idx = e.index
  123 + this.list = []
123 this.page = 1 124 this.page = 1
124 this.myProduct(1) 125 this.myProduct(1)
125 console.log(e); 126 console.log(e);
@@ -10,7 +10,7 @@ @@ -10,7 +10,7 @@
10 <image src="/static/order.png" mode=""></image> 10 <image src="/static/order.png" mode=""></image>
11 <view @click.stop="gophone(11)">订单号：</view> 11 <view @click.stop="gophone(11)">订单号：</view>
12 <view style="margin: 0 16rpx 0 8rpx">{{item.order_no}}</view> 12 <view style="margin: 0 16rpx 0 8rpx">{{item.order_no}}</view>
13 - <view style="color:#2153D4;" @click="copy(item.order_no)">复制</view> 13 + <view style="color:#2153D4;" @click.stop="copy(item.order_no)">复制</view>
14 </view> 14 </view>
15 <view class="right"> 15 <view class="right">
16 <text v-if="item.status==1">待支付</text> 16 <text v-if="item.status==1">待支付</text>
@@ -44,10 +44,10 @@ @@ -44,10 +44,10 @@
44 <view class="line"></view> 44 <view class="line"></view>
45 <view class="botBtn flexA"> 45 <view class="botBtn flexA">
46 <view v-if="reseller(item.status)" class="flexC" @click.stop="openshowBuyer(item)">买家信息</view> 46 <view v-if="reseller(item.status)" class="flexC" @click.stop="openshowBuyer(item)">买家信息</view>
47 - <view v-if="!item.license_preview&&(item.status==2||item.status==3)" class="flexC" @click.stop="openimag(item.id,idx)">上传转赠证明</view>  
48 <view v-if="reseller(item.status)" class="flexC" @click.stop="order_send(item.id,idx)">发货</view> 47 <view v-if="reseller(item.status)" class="flexC" @click.stop="order_send(item.id,idx)">发货</view>
  48 + <view v-if="!item.license_preview&&(item.status==2||item.status==3)" class="flexC yellow" @click.stop="openimag(item.id,idx,1)">上传转赠证明</view>
49 <view v-if="item.license_preview" class="flexC yellow" @click.stop="openshow(item.license_preview)">查看交易证明</view> 49 <view v-if="item.license_preview" class="flexC yellow" @click.stop="openshow(item.license_preview)">查看交易证明</view>
50 - <view v-if="item.license_preview" class="flexC yellow" @click.stop="openimag(item.id,idx)">重新上传证明</view> 50 + <view v-if="item.license_preview" class="flexC yellow" @click.stop="openimag(item.id,idx,2)">重新上传证明</view>
51 </view> 51 </view>
52 </view> 52 </view>
53 </view> 53 </view>
@@ -56,7 +56,7 @@ @@ -56,7 +56,7 @@
56 <view class="popTitle"> 56 <view class="popTitle">
57 转赠证明 57 转赠证明
58 </view> 58 </view>
59 - <image class="popImage" :src="licenimg" mode=""></image> 59 + <image class="popImage" :src="licenimg" mode="scaleToFill"></image>
60 <view class="popBtn flexC"> 60 <view class="popBtn flexC">
61 <view class="btn flexC" @click="show=false">确定</view> 61 <view class="btn flexC" @click="show=false">确定</view>
62 </view> 62 </view>
@@ -68,27 +68,27 @@ @@ -68,27 +68,27 @@
68 <view class="buyerTitle"> 68 <view class="buyerTitle">
69 买家信息 69 买家信息
70 </view> 70 </view>
71 - <view class="list flexA"> 71 + <view class="list flexA" v-if="code">
72 <view class="left"><text style="color: #FC4338;">*</text>接收账户：</view> 72 <view class="left"><text style="color: #FC4338;">*</text>接收账户：</view>
73 <view class="right flexA"> 73 <view class="right flexA">
74 <view class="fw700">{{code}}</view> 74 <view class="fw700">{{code}}</view>
75 - <view style="margin-left: 16rpx;color: rgba(0,0,0,0.4);" @click="copy(code)">复制</view> 75 + <view style="margin-left: 16rpx;color: rgba(0,0,0,0.4);" @click.stop="copy(code)">复制</view>
76 </view> 76 </view>
77 </view> 77 </view>
78 <view class="list flexA"> 78 <view class="list flexA">
79 <view class="left"><text style="color: #FC4338;">*</text>微信号：</view> 79 <view class="left"><text style="color: #FC4338;">*</text>微信号：</view>
80 <view class="right flexA"> 80 <view class="right flexA">
81 <view class="fw700">{{wechart}}</view> 81 <view class="fw700">{{wechart}}</view>
82 - <view style="margin-left: 16rpx;color: rgba(0,0,0,0.4);" @click="copy(code)">复制</view> 82 + <view style="margin-left: 16rpx;color: rgba(0,0,0,0.4);" @click.stop="copy(wechart)">复制</view>
83 </view> 83 </view>
84 </view> 84 </view>
85 - <view class="list flexA"> 85 + <view class="list flexA" v-if="name">
86 <view class="left">联系人：</view> 86 <view class="left">联系人：</view>
87 <view class="right flexA"> 87 <view class="right flexA">
88 <view class="fw700">{{name}}</view> 88 <view class="fw700">{{name}}</view>
89 </view> 89 </view>
90 </view> 90 </view>
91 - <view class="list flexA"> 91 + <view class="list flexA" v-if="phone">
92 <view class="left">联系电话：</view> 92 <view class="left">联系电话：</view>
93 <view class="right flexA"> 93 <view class="right flexA">
94 <view class="fw700">{{phone}}</view> 94 <view class="fw700">{{phone}}</view>
@@ -183,7 +183,7 @@ @@ -183,7 +183,7 @@
183 console.log(this.licenimg) 183 console.log(this.licenimg)
184 }, 184 },
185 //上传证明 185 //上传证明
186 - openimag(id, imgindex) { 186 + openimag(id, imgindex,type) {
187 let that = this 187 let that = this
188 that.imgid = id 188 that.imgid = id
189 that.imgindex = imgindex 189 that.imgindex = imgindex
@@ -200,6 +200,9 @@ @@ -200,6 +200,9 @@
200 token: uni.getStorageSync('token') 200 token: uni.getStorageSync('token')
201 }, 201 },
202 success: (uploadFileRes) => { 202 success: (uploadFileRes) => {
  203 + uni.showToast({
  204 + title:type==1?'上传证明成功':'重新上传证明成功'
  205 + })
203 let data = JSON.parse(uploadFileRes.data); 206 let data = JSON.parse(uploadFileRes.data);
204 console.log(data); 207 console.log(data);
205 that.licenimg = data.data.fullurl; // 绝对路径 208 that.licenimg = data.data.fullurl; // 绝对路径
@@ -399,10 +402,11 @@ @@ -399,10 +402,11 @@
399 justify-content: flex-end; 402 justify-content: flex-end;
400 403
401 view { 404 view {
  405 + box-sizing: border-box;
402 margin-right: 24rpx; 406 margin-right: 24rpx;
403 color: rgba(0, 0, 0, 0.6); 407 color: rgba(0, 0, 0, 0.6);
404 font-size: 24rpx; 408 font-size: 24rpx;
405 - padding: 12rpx 36rpx; 409 + padding: 12rpx 14rpx;
406 // width: 144rpx; 410 // width: 144rpx;
407 height: 56rpx; 411 height: 56rpx;
408 border-radius: 12rpx; 412 border-radius: 12rpx;
@@ -416,6 +420,9 @@ @@ -416,6 +420,9 @@
416 border-color: rgba(254, 208, 0, 1); 420 border-color: rgba(254, 208, 0, 1);
417 color: rgba(0, 0, 0, 0.9); 421 color: rgba(0, 0, 0, 0.9);
418 } 422 }
  423 + .yellow:nth-last-child(1){
  424 + margin-right: 0;
  425 + }
419 } 426 }
420 427
421 .centerBox { 428 .centerBox {
@@ -465,7 +472,7 @@ @@ -465,7 +472,7 @@
465 padding: 32rpx 32rpx; 472 padding: 32rpx 32rpx;
466 box-sizing: border-box; 473 box-sizing: border-box;
467 width: 622rpx; 474 width: 622rpx;
468 - height: 392rpx; 475 + // height: 392rpx;
469 border-radius: 24rpx; 476 border-radius: 24rpx;
470 background: rgba(255, 255, 255, 1); 477 background: rgba(255, 255, 255, 1);
471 478
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)')) 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)'))
2 - 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.ba77b176.js></script><script src=/static/js/index.100fbe17.js></script></body></html>  
  2 +<<<<<<< HEAD
  3 + 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.ba77b176.js></script><script src=/static/js/index.100fbe17.js></script></body></html>
  4 +=======
  5 + 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>
  6 +>>>>>>> 3474d13fb5309675e2ea7f364b5e3a892b8efe5a