pull/1/head
liudan 1 year ago
parent 44249edeab
commit 1805ebc4ad
  1. 4
      components/ClassifyData/ClassifyData.vue
  2. 11
      pages/OrderDetails/OrderDetails.vue
  3. 2
      pages/fenxiao/fansOrder.vue
  4. 17
      pages/warehouse/pay.vue
  5. 19
      pages/warehouse/weituo.vue
  6. 2
      unpackage/dist/build/h5/index.html
  7. 2
      unpackage/dist/build/h5/static/js/index.eb43a0f3.js
  8. 1
      unpackage/dist/build/h5/static/js/pages-OrderDetails-OrderDetails.1fd4b678.js
  9. 1
      unpackage/dist/build/h5/static/js/pages-OrderDetails-OrderDetails.870085f2.js
  10. 1
      unpackage/dist/build/h5/static/js/pages-fenxiao-fansOrder.362dc673.js
  11. 1
      unpackage/dist/build/h5/static/js/pages-fenxiao-fansOrder.46becc4a.js
  12. 1
      unpackage/dist/build/h5/static/js/pages-home-home.14e0a95f.js
  13. 1
      unpackage/dist/build/h5/static/js/pages-home-home.d83295ca.js
  14. 1
      unpackage/dist/build/h5/static/js/pages-warehouse-pay.26403113.js
  15. 1
      unpackage/dist/build/h5/static/js/pages-warehouse-pay.f56df69c.js
  16. 1
      unpackage/dist/build/h5/static/js/pages-warehouse-weituo.142aef1a.js
  17. 1
      unpackage/dist/build/h5/static/js/pages-warehouse-weituo.8d1d0c99.js

@ -2,7 +2,7 @@
<view class="page-total"> <view class="page-total">
<!-- 分类列表 --> <!-- 分类列表 -->
<view class="classify-list"> <view class="classify-list">
<view class="list" @click="onSkip('classify')"> <!-- <view class="list" @click="onSkip('classify')">
<view class="thumb"><image src="/static/img/pin_01.png"></image></view> <view class="thumb"><image src="/static/img/pin_01.png"></image></view>
<view class="name"><text class="one-omit">小米</text></view> <view class="name"><text class="one-omit">小米</text></view>
</view> </view>
@ -21,7 +21,7 @@
<view class="list" @click="onSkip('classify')"> <view class="list" @click="onSkip('classify')">
<view class="thumb"><image src="/static/img/pin_05.png"></image></view> <view class="thumb"><image src="/static/img/pin_05.png"></image></view>
<view class="name"><text class="one-omit">vivo</text></view> <view class="name"><text class="one-omit">vivo</text></view>
</view> </view> -->
</view> </view>
<!-- 超值爆款 --> <!-- 超值爆款 -->
<view class="super-hot-style"> <view class="super-hot-style">

@ -95,7 +95,7 @@
<view class="title"> <view class="title">
付款截图 付款截图
</view> </view>
<image :src="orderDetails.pay_voucher" mode="aspectFit"></image> <image :src="orderDetails.pay_voucher" @click="lookPic([orderDetails.pay_voucher])" mode="aspectFit"></image>
</view> </view>
<view class="btnContainer" v-if="orderDetails.status==0"> <view class="btnContainer" v-if="orderDetails.status==0">
<view class="btnItem" @click.native.stop="uploadPay()">上传凭证</view> <view class="btnItem" @click.native.stop="uploadPay()">上传凭证</view>
@ -126,6 +126,15 @@
}; };
}, },
methods:{ methods:{
lookPic(imgArr){
uni.previewImage({
// current: imgArr[indez],
urls: imgArr,
success: (res) => {
}
});
},
// //
async afterRead(event) { async afterRead(event) {

@ -58,7 +58,7 @@
<text>归属人{{item.seller.nickname}}</text> <text>归属人{{item.seller.nickname}}</text>
</view> </view>
<view class="btn"> <view class="btn">
<text>购买人{{item.seller.nickname}}</text> <text>购买人{{item.buyer.nickname}}</text>
</view> </view>
</view> </view>
</view> </view>

@ -74,14 +74,14 @@
</view> </view>
<view class="zfb" v-show="activeIndex==2"> <view class="zfb" v-show="activeIndex==2">
<image :src="zfburl" v-if="zfburl" mode="aspectFit" @click="uploadZfb"></image> <image :src="zfburl" v-if="zfburl" @click="lookPic([zfburl])" mode="aspectFit"></image>
<image src="/static/image/up_img.png" v-else mode="aspectFit" @click="uploadZfb"></image> <image src="/static/image/up_img.png" v-else mode="aspectFit"></image>
</view> </view>
<view class="zfb" v-show="activeIndex==3"> <view class="zfb" v-show="activeIndex==3">
<image :src="wxurl" mode="aspectFit" v-if="wxurl" @click="uploadwx"></image> <image :src="wxurl" mode="aspectFit" @click="lookPic([wxurl])" v-if="wxurl"></image>
<image src="/static/image/up_img.png" mode="aspectFit" v-else @click="uploadwx"></image> <image src="/static/image/up_img.png" mode="aspectFit" v-else></image>
</view> </view>
<!-- <view class="yhk"> <!-- <view class="yhk">
@ -163,6 +163,15 @@
this.getText() this.getText()
}, },
methods:{ methods:{
lookPic(imgArr){
uni.previewImage({
// current: imgArr[indez],
urls: imgArr,
success: (res) => {
}
});
},
getPay(item){ getPay(item){
this.activeIndex = item.id; this.activeIndex = item.id;
}, },

@ -149,6 +149,15 @@
} }
payUpGoods(params).then(res=>{ payUpGoods(params).then(res=>{
let self = this; let self = this;
if(res.data.pay_data==1){
uni.showToast({
title:"支付成功",
icon:'none'
});
uni.redirectTo({
url:"/pages/qianggou/productList"
})
}else{
jweixin.config({ jweixin.config({
debug: false, // ,apialertpclogpc debug: false, // ,apialertpclogpc
appId: res.data.pay_data.appId, // appId: res.data.pay_data.appId, //
@ -181,8 +190,11 @@
icon:'none' icon:'none'
}); });
uni.redirectTo({ uni.redirectTo({
url:"/pages/warehouse/buy" url:"/pages/qianggou/productList"
}) })
// uni.redirectTo({
// url:"/pages/warehouse/buy"
// })
}, },
cancel: function(res) { cancel: function(res) {
console.log(res) console.log(res)
@ -199,6 +211,9 @@
jweixin.error(function(res) { jweixin.error(function(res) {
console.log(res); console.log(res);
}); });
this.getOrderDetails()
}
// if (typeof WeixinJSBridge != "undefined") { // if (typeof WeixinJSBridge != "undefined") {
@ -226,7 +241,7 @@
// } // }
// }) // })
// } // }
this.getOrderDetails()
}) })
}, },

@ -1,2 +1,2 @@
<!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)')) <!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.63b34199.css></head><body><noscript><strong>Please enable JavaScript to continue.</strong></noscript><div id=app></div><script src=/static/js/chunk-vendors.4cb2825c.js></script><script src=/static/js/index.bd4b2525.js></script></body></html> 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.63b34199.css></head><body><noscript><strong>Please enable JavaScript to continue.</strong></noscript><div id=app></div><script src=/static/js/chunk-vendors.4cb2825c.js></script><script src=/static/js/index.eb43a0f3.js></script></body></html>

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long
Loading…
Cancel
Save