Skip to content

M
mallapp
Commit 1f0a8398 authored by zhangjianguo's avatar zhangjianguo
Browse files
Options

样式修改

parent aae45b5a
Hide whitespace changes
Inline Side-by-side
Showing with 136 additions and 22 deletions
components/cats/style11.vue
View file @ 1f0a8398
......@@ -46,12 +46,14 @@
</view>
</view>
<good-sku v-if="showSku" :option-type="2" borderRadius="20" v-model="showSku" :good="sku"></good-sku>
<auth v-if="showAuth" @changeuserinfo="reloadUserinfo" @gbAuth="gbAuth"></auth>
</view>
</template>
<script>
import sidebar from '../sidebar/index';
import goodSku from '../goods/goodsku';
import auth from '@/components/auth/index.vue';
export default {
props: ['d', 'h'],
data() {
......@@ -80,11 +82,13 @@ export default {
CategoryIds1: '',
CategoryIds2: '',
sku: {},
showSku: false
showSku: false,
showAuth: false,
u: {}
};
},
components: {
sidebar,goodSku
sidebar,goodSku,auth
},
created() {
this.mainColor = this.$uiConfig.mainColor;
......@@ -104,7 +108,16 @@ export default {
// 购物车
showSkuHandler(g) {
this.sku = g;
this.showSku = true;
this.u = uni.getStorageSync('mall_UserInfo');
if (!this.u) {
this.u = {
nickName: '未登录',
avatarUrl: ''
};
this.showAuth = true;
} else {
this.showSku = true;
}
},
changeHandler(i) {
this.active = i;
......@@ -182,6 +195,14 @@ export default {
} else {
this.isover = true;
}
},
reloadUserinfo() {
this.u = uni.getStorageSync('mall_UserInfo');
this.showAuth = false;
},
//关闭登录窗口
gbAuth() {
this.showAuth = false;
}
}
};
......
components/cats/style4.vue
View file @ 1f0a8398
......@@ -68,12 +68,14 @@
</scroll-view>
</div>
<good-sku v-if="showSku" :option-type="2" borderRadius="20" v-model="showSku" :good="sku"></good-sku>
<auth v-if="showAuth" @changeuserinfo="reloadUserinfo" @gbAuth="gbAuth"></auth>
</view>
</template>
<script>
import goodSku from '../goods/goodsku';
import sidebar from "../sidebar/index";
import auth from '@/components/auth/index.vue';
export default {
props: ["d", "h"],
......@@ -99,11 +101,13 @@ export default {
UserId:0,
},
sku: {},
showSku: false
showSku: false,
showAuth:false,
u:{},
};
},
components: {
sidebar,goodSku
sidebar,goodSku,auth
},
created() {
this.mainColor = this.$uiConfig.mainColor;
......@@ -116,7 +120,16 @@ export default {
// 购物车
showSkuHandler(g) {
this.sku = g;
this.showSku = true;
this.u = uni.getStorageSync('mall_UserInfo');
if (!this.u) {
this.u = {
nickName: '未登录',
avatarUrl: ''
};
this.showAuth = true;
} else {
this.showSku = true;
}
},
changeHandler(i) {
this.msg.CategoryIds= this.d[i].Id+'';
......@@ -180,6 +193,14 @@ export default {
this.isover = true;
}
},
reloadUserinfo() {
this.u = uni.getStorageSync('mall_UserInfo');
this.showAuth = false;
},
//关闭登录窗口
gbAuth() {
this.showAuth = false;
}
},
};
</script>
......
components/cats/style8.vue
View file @ 1f0a8398
......@@ -72,12 +72,14 @@
</view>
</view>
<good-sku v-if="showSku" :option-type="2" borderRadius="20" v-model="showSku" :good="sku"></good-sku>
<auth v-if="showAuth" @changeuserinfo="reloadUserinfo" @gbAuth="gbAuth"></auth>
</view>
</template>
<script>
import sidebar from "../sidebar/index";
import goodSku from '../goods/goodsku';
import auth from '@/components/auth/index.vue';
export default {
props: ["d", "h"],
data() {
......@@ -106,11 +108,13 @@ export default {
CategoryIds1:'',
CategoryIds2:'',
sku: {},
showSku: false
showSku: false,
showAuth: false,
u: {}
};
},
components: {
sidebar,goodSku
sidebar,goodSku,auth
},
created() {
this.mainColor = this.$uiConfig.mainColor;
......@@ -130,7 +134,16 @@ export default {
// 购物车
showSkuHandler(g) {
this.sku = g;
this.showSku = true;
this.u = uni.getStorageSync('mall_UserInfo');
if (!this.u) {
this.u = {
nickName: '未登录',
avatarUrl: ''
};
this.showAuth = true;
} else {
this.showSku = true;
}
},
changeHandler(i) {
this.active=i;
......@@ -207,7 +220,15 @@ export default {
} else {
this.isover = true;
}
}
},
reloadUserinfo() {
this.u = uni.getStorageSync('mall_UserInfo');
this.showAuth = false;
},
//关闭登录窗口
gbAuth() {
this.showAuth = false;
}
}
};
</script>
......
components/goods/list.vue
View file @ 1f0a8398
......@@ -30,20 +30,25 @@
v-model="showSku"
:good="sku"
></good-sku>
<auth v-if="showAuth" @changeuserinfo="reloadUserinfo" @gbAuth="gbAuth"></auth>
</view>
</template>
<script>
import goodSku from "../goods/goodsku";
import auth from '@/components/auth/index.vue';
export default {
components: {
goodSku,
auth
},
props: ["list"],
data() {
return {
g: [],
showSku: false,
showAuth:false,
u:{},
sku: {},
mainColor: "",
setting:{}
......@@ -73,8 +78,25 @@ export default {
},
showSkuHandler(g) {
this.sku = g;
this.showSku = true;
this.u = uni.getStorageSync('mall_UserInfo');
if (!this.u) {
this.u = {
nickName: '未登录',
avatarUrl: ''
};
this.showAuth = true;
} else {
this.showSku = true;
}
},
reloadUserinfo() {
this.u = uni.getStorageSync('mall_UserInfo');
this.showAuth = false;
},
//关闭登录窗口
gbAuth() {
this.showAuth = false;
}
},
};
</script>
......
pages/goods/goods.vue
View file @ 1f0a8398
......@@ -120,7 +120,7 @@
<view class="sku-box u-skeleton-rect" v-if="setting.is_express == '1'">
<view class="label">快递</view>
<view class="content">
{{ g.express == "" ? "免运费" : g.express }}
￥{{ g.express == "" ? "免运费" : g.express }}
</view>
</view>
<view
......@@ -232,7 +232,7 @@
:images="g.pic_url"
@close="closeShare"
></share>
<!-- <auth></auth> -->
<auth v-if="showAuth" @changeuserinfo="reloadUserinfo" @gbAuth="gbAuth"></auth>
</view>
</template>
......@@ -271,7 +271,9 @@ export default {
pageSize:20,
GoodsId:0,
CommentGrade:0
}
},
showAuth:false,
u:{},
};
},
components: {
......@@ -291,10 +293,21 @@ export default {
if(option&&option.pid){
uni.setStorageSync("pid", {pid:option.pid});
}
this.init();
this.u = uni.getStorageSync('mall_UserInfo');
if (!this.u) {
this.u = {
nickName: '未登录',
avatarUrl: ''
};
this.showAuth = true;
} else {
this.init();
this.initPage();
}
this.mc = this.$uiConfig.mainColor;
this.secondary = this.$uiConfig.secondary;
this.initPage();
this.setting = uni.getStorageSync("basedata").mall.setting
},
onShareAppMessage(res) {
......@@ -305,6 +318,16 @@ export default {
};
},
methods: {
reloadUserinfo() {
this.u = uni.getStorageSync('mall_UserInfo');
this.init();
this.initPage();
},
//关闭登录窗口
gbAuth() {
uni.navigateBack()
},
initPage() {
let currentPages = getCurrentPages();
let u = "/" + currentPages[currentPages.length - 1].route;
......
pages/order-submit/order-submit.vue
View file @ 1f0a8398
......@@ -682,7 +682,7 @@ button[disabled]{
margin-bottom: 15px;
}
.ordersubmit .goodbox .goodinfo .attr {
height: 14px;
height: 16px;
font-size: 12px;
color: #999;
overflow: hidden;
......
pages/share/cash/cash.vue
View file @ 1f0a8398
......@@ -5,7 +5,7 @@
<Text style='font-size: 18px;margin-top: 10px;'>账户剩余余额：{{cash.CommissionWithdrawal}}元</Text>
<Text style='font-size: 14px;color:#333 ;margin-top: 10px;'>今日剩余提现金额:{{cash.CanRemitMoney==-1?'不限':cash.CanRemitMoney+'元'}}</Text>
<Text style='font-size: 14px;color:#333 ;margin-top: 10px;'>最少提现额度:{{cash.MinimumWithdrawalLimit}}元</Text>
<Text style='font-size: 14px;color:#333 ;margin-top: 10px;'>手续费 百分比:{{cash.WithdrawFee}}%</Text>
<Text style='font-size: 14px;color:#333 ;margin-top: 10px;'>手续费:{{cash.WithdrawFee}}%</Text>
<!-- <view style="display: flex;flex-direction: row;align-items: center;margin-top: 10px;">
<Text style='font-size: 12px;color:#333 '>今日提现金额无限制</Text>
<view class="rule" :style="{'border-color':mainColor}" @click="show2=true">
......@@ -16,10 +16,12 @@
<view class="tixian">
<view style='display: flex;flex-direction: row;align-items: center;'>
<Text :style="{'color':mainColor,'font-size':'18px'}">￥</Text>
<input class="uni-input" v-model="msg.AppliedMoney" placeholder="请输入提现金额" style="font-size: 16px;margin-left: 5px;"/>
<input class="uni-input" type='number' v-model="msg.AppliedMoney" placeholder="请输入提现金额" @input='liedMoney' style="font-size: 16px;margin-left: 5px;"/>
</view>
<Text @click='allmoney'>全部</Text>
</view>
<view style="width: 100%;height: 1px;background: #f5f5f5;margin: 10px 0;"></view>
<Text style='font-size: 14px;color:#333 ;margin: 10px 0;'>手续费扣除:{{msg.Fee}}元</Text>
</view>
<view class="txmode">
<Text>提现方式</Text>
......@@ -191,8 +193,12 @@
},
allmoney(){
this.msg.AppliedMoney = Number(this.cash.CommissionWithdrawal)
this.msg.Fee = (Number(this.cash.WithdrawFee*0.01*this.msg.AppliedMoney)).toFixed(2);
},
liedMoney(val){
this.msg.AppliedMoney = Number(val.target.value)
this.msg.Fee = (Number(this.cash.WithdrawFee*0.01*this.msg.AppliedMoney)).toFixed(2);
},
radioChange(item){
this.txmode = item.Name;
this.msg.WithdrawalWay = item.Id;
......@@ -253,8 +259,8 @@
}
}
this.msg.Fee = this.cash.WithdrawFee*0.01*this.msg.AppliedMoney;
this.msg.AppliedMoney = this.msg.AppliedMoney - this.msg.Fee; //最终提现要减去 手续费
this.msg.Fee = Number(this.msg.Fee);
this.msg.RemitMoney = this.msg.AppliedMoney - this.msg.Fee; //最终提现要减去 手续费
uni.showNavigationBarLoading();
this.request2(
{
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment