燕成杰 / Bitcoin · 提交

转到一个项目

作者 燕成杰
提交 7276da6e78203327b93293ba2c6d36a3f1b5413c 2 个父辈 bdb0a563 dbbef27b

合并分支 'yan' 到 'master' 

Yan



查看合并请求 !21
内嵌 并排对比
正在显示 10 个修改的文件 包含 26 行增加 和 20 行删除
... ... @@ -70,7 +70,7 @@
},
"vueVersion" : "2",
"h5" : {
"title" : "元届印象",
"title" : "琉璃藏宝阁",
"router" : {
"mode" : "history"
}
... ...
... ... @@ -210,7 +210,7 @@
],
"globalStyle": {
"navigationBarTextStyle": "black",
"navigationBarTitleText": "元届印象",
"navigationBarTitleText": "琉璃藏宝阁",
"navigationBarBackgroundColor": "#F8F8F8",
"backgroundColor": "#F8F8F8"
}
... ...
... ... @@ -84,15 +84,15 @@
<view class="tip">
</view>
<text>卖家信息</text>
<text>商品详情</text>
</view>
<view class="showcontant">
{{detail.description}}
</view>
</view>
<view class="btn">
<view class="paybtn" @click="product_buy">
立即购买
<view class="paybtn" :class="detail.status==2?'sold':''" @click="product_buy">
{{detail.status==2?'已售出':'立即购买'}}
</view>
</view>
<!-- <u-picker :show="resurtshow" :columns="columns"></u-picker> -->
... ... @@ -387,7 +387,8 @@
}
},
//下单跳转
async product_buy() {
async product_buy() {
if(this.detail.status==2) return
uni.navigateTo({
url: "/pages/index/buy?id=" + this.id
})
... ... @@ -498,7 +499,7 @@
color: rgba(0, 0, 0, 0.4);
font-size: 24rpx;
font-weight: 400;
font-family: "PingFang SC";
font-family: "PingFang SC";
}
.missbar {
... ... @@ -531,7 +532,7 @@
border-radius: 24rpx;
padding: 32rpx;
box-sizing: border-box;
white-space: pre-wrap;
.misstop {
display: flex;
align-items: center;
... ... @@ -737,5 +738,8 @@
position: fixed;
right: 28rpx;
bottom: 186rpx;
}
.sold {
background: rgba(0,0,0,.2) !important;
}
</style>
... ...
... ... @@ -5,7 +5,7 @@
<u-tabs :list="list2" lineColor="#FED000" :scrollable="false" @click="onclick"></u-tabs>
</u-sticky>
<view class="group">
<view class="item" v-for="(item,idx) in showlist" :key="idx" @click.stop="ondetail(item.id)">
<view class="item" v-for="(item,idx) in showlist" :key="idx" @click.stop="ondetail(item.id,item.orderinfo.product_id)">
<view class="top flexA">
<view class="left flexA">
<image src="/static/order.png" mode=""></image>
... ... @@ -101,10 +101,10 @@
},
methods: {
// 跳转详情
ondetail(id) {
ondetail(id,shopId) {
console.log(id)
uni.navigateTo({
url: "/pages/mine/order_detail?id=" + id
url: `/pages/mine/order_detail?id=${id}&shopId=${shopId}`
})
},
//确认收货
... ...
... ... @@ -7,7 +7,7 @@
退出登录
</view>
<view class="topInfo flexA">
<image :src="userInfo.avatar" mode=""></image>
<image @click="doLogin" :src="userInfo.avatar || '/static/loginUser.png'" mode=""></image>
<view class="right">
<view class="" @click="doLogin">{{userInfo.nickname || '登录'}}</view>
<view class="">{{userInfo.mobile || ''}}</view>
... ...
... ... @@ -16,7 +16,7 @@
<template v-slot:default="item">
<view class="item">
<view class="title">{{item.name}}</view>
<view class="desc">所属分裂 {{item.sort.name}}</view>
<view class="desc">所属分类 {{item.sort.name}}</view>
<view class="desc flexA">
{{item.seller_name}}
<view class="money">
... ...
... ... @@ -73,18 +73,20 @@
price: "",
images_preview: "",
}
},
},
shopId:''
};
},
onLoad(options) {
this.id = options.id
this.id = options.id
this.shopId = options.shopId
this.order_detail()
},
methods: {
//跳转详情
ondetail(item) {
uni.navigateTo({
url: "/pages/index/detail?id=" + item
url: "/pages/index/detail?id=" + this.shopId
})
},
//订单详情
... ...
... ... @@ -172,13 +172,13 @@
console.log(this.form);
if(this.type==1){
if(this.form.withdraw_type==1){
toa.toast('去微信授权')
toa.toast('微信提现暂未开放，敬请期待')
}else {
this.toTakeMoney()
}
}else {
if(this.form.withdraw_type==1){
toa.toast('去微信授权')
toa.toast('微信提现暂未开放，敬请期待')
}else {
this.takeBail()
}
... ...
<!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.4518487c.js></script></body></html>
\ No newline at end of file
<!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.e92a2594.js></script></body></html>
\ No newline at end of file
... ...