theluyuan/demingshangjia
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request 'gdpao' (#106) from gyh into master

Browse Source 
Reviewed-on: http://git.luyuan.tk/luyuan/demingshangjia/pulls/106
This commit is contained in:
gyh 2020-09-18 14:23:48 +08:00
commit a732778481
4 changed files with 31 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
pages/index/details.vue
View File

@ -16,19 +16,19 @@
</view>
</view>
<u-radio-group class="box" v-model="value" v-if="type>3">
<view class="goods-info" v-for="list in info.refund_list">
<image :src="list.goods_image"></image>
<view class="goods-info" v-for="list in info.goods_list">
<image :src="list.image_480_url"></image>
<view class="info-right">
<view class="name u-line-1">{{ list.goods_name }}</view>
<view class="info">
<view class="num">共{{ list.goods_num }}件商品</view>
<view class="price">
实付
<span>￥{{ list.refund_amount }}</span>
<span>￥{{ list.goods_pay_price }}</span>
</view>
</view>
</view>
<u-radio :name="list.refund_id" v-if="type==4" shape="circle" @change="radioGroupChange">
<!-- <u-radio :name="list.refund_id" v-if="type==4" shape="circle" @change="radioGroupChange"> -->
</u-radio >
</view>
</u-radio-group>
@ -408,14 +408,15 @@ export default {
//
confirm() {
this.showRefunds = false;
if (!this.refundid) {
this.$refs.uToast.show({
title: "请选择商品",
type: "warning"
});
return;
}
// if (!this.refundid) {
// this.$refs.uToast.show({
// title: "请选择商品",
// type: "warning"
// });
// return;
// }
if (this.cur == 0) {
console.log(this.refundid);
// 确定退款
this.$u.api.refund({
refund_id: this.refundid,
@ -593,6 +594,8 @@ export default {
// 自提
this.mineBy_img = res.data.extend_order_common.sendimg; // 自提图片
this.mineBy_text = res.data.extend_order_common.deliver_explain; // 自提备注
// 退款id
this.refundid = res.data.refund_list[0].refund_id;
// console.log(this.invoiceList,this.is_invoice,this.invoice_type);
}
});

13
pages/login/login.vue
View File

@ -20,7 +20,7 @@
<view class="" v-if="state==0">
<view class="labales">
<image src="../../static/image/login/login(3).png"></image>
<input v-model="zhanghao" type="text" placeholder="请输入账号" />
<input v-model="zhanghao" type="text" @blur="getBlurVal" placeholder="请输入账号" />
</view>
<view class="labales">
<image src="../../static/image/login/login(1).png"></image>
@ -30,7 +30,7 @@
<view class="" v-else-if="state==1">
<view class="labales">
<image src="../../static/image/login/login(3).png"></image>
<input v-model="zhanghaoA" type="text" placeholder="请输入账号" />
<input v-model="zhanghaoA" type="text" @blur="getBlurVal1" placeholder="请输入账号" />
</view>
<view class="labales">
<image src="../../static/image/login/login(1).png"></image>
@ -128,6 +128,15 @@ export default {
}
})
},
// 失去焦点获取数据
getBlurVal(e) {
// console.log(e.detail.value);
this.zhanghao = this.$u.trim(e.detail.value,"all");
},
getBlurVal1(e) {
this.zhanghaoA = this.$u.trim(e.detail.value,"all");
// console.log(this.$u.trim(this.zhanghaoA));
},
logins() {
// 判断是否可以点击
// console.log(this.zhanghao);

7
pages/user/index.vue
View File

@ -6,16 +6,16 @@
<view class="name">
<text>{{info.member_nickname==null?"新用户":info.member_nickname}}</text>
<text>账号：{{info.member_name}}</text>
<text>个性签名：{{info.signature==""?"该用户很懒没有签名！":info.signature}}</text>
<text class="u-line-2">个性签名：{{info.signature==""?"该用户很懒没有签名！":info.signature}}</text>
</view>
</view>
<image src="/static/image/user/1.png"></image>
</view>
<view class="nav" @click="toOthersPage('fans')">
<text>我的粉丝</text>
<image src="/static/image/user/1.png"></image>
<image src="/static/image/user/1.png"></image>
</view>
<view class="nav" @click="toOthersPage('content')">
<view class="nav" @click="toOthersPage('content')">
<text>内容管理</text>
<image src="/static/image/user/1.png"></image>
</view>
@ -160,6 +160,7 @@ export default {
align-items: center;
>image{
flex-shrink: 0;
width: 110rpx;
height: 110rpx;
border-radius: 50%;

3
pages/user/myinfo.vue
View File

@ -6,7 +6,7 @@
<view class="name">
<text>{{info.member_nickname==null?"新用户":info.member_nickname}}</text>
<text>账号：{{info.member_name}}</text>
<text>个性签名：{{info.signature==""?"该用户很懒没有签名！":info.signature}}</text>
<text class="u-line-2">个性签名：{{info.signature==""?"该用户很懒没有签名！":info.signature}}</text>
</view>
</view>
<image src="/static/image/user/1.png"></image>
@ -278,6 +278,7 @@ export default {
align-items: center;
>image{
flex-shrink: 0;
width: 110rpx;
height: 110rpx;
border-radius: 50%;