Browse Source

优化细节

zyh
gaoxs 5 years ago
parent
commit
d8f92720d2
  1. 2
      assets/css/style.css
  2. 2
      assets/css/style.css.map
  3. 3
      assets/css/style.less
  4. 1
      pages/activity/GoodsSeckill/index.vue
  5. 1
      pages/order/MyOrder/index.vue
  6. 39
      pages/order/OrderDetails/index.vue
  7. 2
      pages/orderAdmin/OrderIndex/index.vue
  8. 4
      pages/user/UserAccount/index.vue
  9. 28
      pages/user/address/AddAddress/index.vue

2
assets/css/style.css

File diff suppressed because one or more lines are too long

2
assets/css/style.css.map

File diff suppressed because one or more lines are too long

3
assets/css/style.less

@ -1,3 +1,6 @@
page {
background: #f5f5f5;
}
.newsList .newsSwitch .van-hairline--top-bottom::after { .newsList .newsSwitch .van-hairline--top-bottom::after {
border: 0; border: 0;
} }

1
pages/activity/GoodsSeckill/index.vue

@ -177,6 +177,7 @@ export default {
that.status = false; that.status = false;
that.active = index; that.active = index;
that.datatime = that.timeList[that.active].stop; that.datatime = that.timeList[that.active].stop;
this.seckillList=[]
that.getSeckillList(); that.getSeckillList();
}, },
getSeckillList: function() { getSeckillList: function() {

1
pages/order/MyOrder/index.vue

@ -320,6 +320,7 @@ export default {
</script> </script>
<style scoped lang="less"> <style scoped lang="less">
.noCart { .noCart {
margin-top: 0.17 * 100rpx; margin-top: 0.17 * 100rpx;
padding-top: 0.1 * 100rpx; padding-top: 0.1 * 100rpx;

39
pages/order/OrderDetails/index.vue

@ -311,28 +311,6 @@
</view> </view>
</view> </view>
</template> </template>
<script>
export default {
methods: {
goGoodsReturn(orderInfo) {
this.$yrouter.push({
path: "/pages/order/GoodsReturn/index",
query: {
id: orderInfo.orderId
}
});
},
goGroupRule(orderInfo) {
this.$yrouter.push({
path: "/pages/activity/GroupRule/index",
query: {
id: orderInfo.pinkId
}
});
}
}
};
</script>
<style scoped lang="less"> <style scoped lang="less">
.geoPage { .geoPage {
position: fixed; position: fixed;
@ -527,6 +505,23 @@ export default {
}, },
methods: { methods: {
copyClipboard, copyClipboard,
goGoodsReturn(orderInfo) {
this.$yrouter.push({
path: "/pages/order/GoodsReturn/index",
query: {
id: orderInfo.orderId
}
});
},
goGroupRule(orderInfo) {
console.log(orderInfo)
this.$yrouter.push({
path: "/pages/activity/GroupRule/index",
query: {
id: orderInfo.pinkId
}
});
},
showChang: function() { showChang: function() {
// //
if (isWeixin()) { if (isWeixin()) {

2
pages/orderAdmin/OrderIndex/index.vue

@ -17,7 +17,7 @@
<view class="num">{{ census.orderCount.evaluatedCount }}</view> <view class="num">{{ census.orderCount.evaluatedCount }}</view>
<view>待评价</view> <view>待评价</view>
</view> </view>
<view class="item" @click="goAdminOrderList(3)"> <view class="item" @click="goAdminOrderList(4)">
<view class="num">{{ census.orderCount.refundCount }}</view> <view class="num">{{ census.orderCount.refundCount }}</view>
<view>退款</view> <view>退款</view>
</view> </view>

4
pages/user/UserAccount/index.vue

@ -62,8 +62,8 @@ export default {
this.getActivity(); this.getActivity();
}, },
methods: { methods: {
goUserBill(id) { goUserBill(types) {
this.$yrouter.push({ path: "/pages/user/UserBill/index", query: { id } }); this.$yrouter.push({ path: "/pages/user/UserBill/index", query: { types } });
}, },
getIndex: function() { getIndex: function() {
let that = this; let that = this;

28
pages/user/address/AddAddress/index.vue

@ -11,7 +11,7 @@
</view> </view>
<view class="item acea-row row-between-wrapper"> <view class="item acea-row row-between-wrapper">
<view class="name">所在地区</view> <view class="name">所在地区</view>
<view class="picker acea-row row-between-wrapper select-value form-control" > <view class="picker acea-row row-between-wrapper select-value form-control">
<view class="address" @tap="openAddres2"> <view class="address" @tap="openAddres2">
<!-- <picker <!-- <picker
@columnchange="addRessColumnchange" @columnchange="addRessColumnchange"
@ -23,7 +23,7 @@
<text class="uni-input" v-if="model2">{{model2}}</text> <text class="uni-input" v-if="model2">{{model2}}</text>
<text class="uni-input" v-else>请选择地区</text> <text class="uni-input" v-else>请选择地区</text>
</picker>--> </picker>-->
<text class="uni-input" >{{model2||'请选择'}}</text> <text class="uni-input">{{model2||'请选择'}}</text>
<simple-address <simple-address
ref="simpleAddress" ref="simpleAddress"
:pickerValueDefault="cityPickerValueDefault" :pickerValueDefault="cityPickerValueDefault"
@ -107,18 +107,28 @@ export default {
}, },
openAddres2() { openAddres2() {
// label // label
if (this.address.province) {
// city
if(this.address.province){ let str = "市";
let city = this.address.city;
if (this.address.province.indexOf(str) != -1) {
city = "市辖区";
}
var index = this.$refs.simpleAddress.queryIndex( var index = this.$refs.simpleAddress.queryIndex(
[this.address.province, this.address.city, this.address.district], [this.address.province, city, this.address.district],
"label" "label"
); );
console.log(index); console.log(index);
this.cityPickerValueDefault = index.index; this.cityPickerValueDefault = index.index;
} }
this.$refs.simpleAddress.open(); this.$refs.simpleAddress.open();
// var index = this.$refs.simpleAddress.queryIndex(
// [13, 1302, 130203],
// "value"
// );
// this.cityPickerValueDefault = index.index;
// this.$refs.simpleAddress.open();
}, },
openAddres3() { openAddres3() {
// value // value
@ -228,8 +238,8 @@ if(this.address.province){
</script> </script>
<style lang="less"> <style lang="less">
.address{ .address {
text{ text {
width: 100%; width: 100%;
display: block; display: block;
} }

Loading…
Cancel
Save