Skip to content

M
mallapp
Commit 1874162d authored by 黄媛媛's avatar 黄媛媛
Browse files
Options

Merge branch 'master' of http://gitlab.oytour.com/viitto/mallapp

parents 08343556 83de98fd
Show whitespace changes
Inline Side-by-side
Showing with 1051 additions and 1054 deletions
components/goods/goodsku.vue
View file @ 1874162d
...@@ -21,9 +21,7 @@ ...@@ -21,9 +21,7 @@
</view> </view>
<view class="amount">库存 {{ goodamount }} {{ g.unit }}</view> <view class="amount">库存 {{ goodamount }} {{ g.unit }}</view>
<view class="sku">{{ skuObj ? '已选择' : '选择' }} {{ sku }}</view> <view class="sku">{{ skuObj ? '已选择' : '选择' }} {{ sku }}</view>
<view class="sku_close"> <view class="sku_close"><u-icon name="cross" color="#9F9F9F" @click="cloGood()" size="40" /></view>
<u-icon name="cross" color="#9F9F9F" @click="cloGood()" size="40"/>
</view>
</view> </view>
</view> </view>
<view class="sku-box"> <view class="sku-box">
...@@ -204,7 +202,7 @@ export default { ...@@ -204,7 +202,7 @@ export default {
GoodsId: this.skuObj.goods_id, GoodsId: this.skuObj.goods_id,
SpecificationSort: this.skuObj.sign_id, SpecificationSort: this.skuObj.sign_id,
Number: this.gc == 0 ? 1 : this.gc Number: this.gc == 0 ? 1 : this.gc
}, }
}, },
res => { res => {
uni.showToast({ uni.showToast({
...@@ -225,38 +223,27 @@ export default { ...@@ -225,38 +223,27 @@ export default {
} }
}, },
buy() { buy() {
let ShoppingCartIdList=[]; let ShoppingCartIdList = [];
if (this.skuObj && this.skuObj.id) { if (this.skuObj && this.skuObj.id) {
let good = { let good = {
DetailList: [], DetailList: [],
Use_Integral: 0, Use_Integral: 0,
User_Coupon_Id: 0, User_Coupon_Id: 0,
DeliveryMethod:0, DeliveryMethod: 0,
AddressId:0, AddressId: 0
}; };
let g = { let g = {
GoodsId: this.skuObj.goods_id, GoodsId: this.skuObj.goods_id,
Number: this.gc, Number: this.gc,
SpecificationSort: this.skuObj.sign_id, SpecificationSort: this.skuObj.sign_id
}; };
good.DetailList.push(g); good.DetailList.push(g);
// let g = {
// id: this.skuObj.goods_id,
// num: this.gc,
// cart_id: 0,
// goods_attr_id: this.skuObj.id,
// attr: []
// };
// this.skuObj.attr_list.forEach(x => {
// g.attr.push({
// attr_id: x.attr_id,
// attr_group_id: x.attr_group_id
// });
// });
// this.forms.list[0].goods_list.push(g);
// this.forms.list[0].mch_id = this.g.mch_id;
uni.navigateTo({ uni.navigateTo({
url: '/pages/order-submit/order-submit?formData=' + encodeURIComponent(JSON.stringify(good))+'&IsFormShoppingCart=2&ShoppingCartIdList='+JSON.stringify(ShoppingCartIdList), url:
'/pages/order-submit/order-submit?formData=' +
encodeURIComponent(JSON.stringify(good)) +
'&IsFormShoppingCart=2&ShoppingCartIdList=' +
JSON.stringify(ShoppingCartIdList),
complete(res) { complete(res) {
console.log(res); console.log(res);
} }
...@@ -423,7 +410,7 @@ export default { ...@@ -423,7 +410,7 @@ export default {
width: 1px; width: 1px;
position: relative; position: relative;
} }
.goodsku .chosen-info .sku_close{ .goodsku .chosen-info .sku_close {
position: absolute; position: absolute;
right: 4px; right: 4px;
top: 5px; top: 5px;
......
components/goods/style1.vue
View file @ 1874162d
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
:style="{ :style="{
'background-color': goodsInfo.backgroundColor, 'background-color': goodsInfo.backgroundColor,
'background-image': goodsInfo.backgroundPicUrl, 'background-image': goodsInfo.backgroundPicUrl,
'border-color': goodsInfo.goodsStyle == 2 ? 'rgb(226, 226, 226)' : '', 'border-color': goodsInfo.goodsStyle == 2 ? 'rgb(226, 226, 226)' : ''
}" }"
> >
<div <div
...@@ -13,17 +13,10 @@ ...@@ -13,17 +13,10 @@
@click="openGood(item)" @click="openGood(item)"
:style="{ :style="{
border: goodsInfo.goodsStyle == 2 ? '1px solid rgb(226, 226, 226)' : '', border: goodsInfo.goodsStyle == 2 ? '1px solid rgb(226, 226, 226)' : '',
background: background: goodsInfo.goodsStyle == 1 || goodsInfo.goodsStyle == 2 ? '#FFF' : ''
goodsInfo.goodsStyle == 1 || goodsInfo.goodsStyle == 2 ? '#FFF' : '',
}" }"
> >
<div class="tips" v-if="goodsInfo.showGoodsTag"> <div class="tips" v-if="goodsInfo.showGoodsTag"><image :src="goodsInfo.goodsTagPicUrl" mode="widthFix" style="width: 100%;" /></div>
<image
:src="goodsInfo.goodsTagPicUrl"
mode="widthFix"
style="width: 100%;"
/>
</div>
<image <image
style="width: calc(100vw - 24px); height: 66vw;" style="width: calc(100vw - 24px); height: 66vw;"
:mode="goodsInfo.fill == 1 ? 'aspectFill' : 'aspectFit'" :mode="goodsInfo.fill == 1 ? 'aspectFill' : 'aspectFit'"
...@@ -41,66 +34,52 @@ ...@@ -41,66 +34,52 @@
:src="item.picUrl" :src="item.picUrl"
/> />
<div class="good-info"> <div class="good-info">
<div class="good-name" v-if="goodsInfo.showGoodsName"> <div class="good-name" v-if="goodsInfo.showGoodsName">{{ item.name }}</div>
{{ item.name }}
</div>
<div class="good-price-info"> <div class="good-price-info">
<span class="price" :style="{ color: mainColor }">{{ <span class="price" :style="{ color: mainColor }">{{ goodsInfo.showGoodsPrice ? getPrice(item.price) : '' }}</span>
goodsInfo.showGoodsPrice ? getPrice(item.price) : ""
}}</span>
<span class="buy" v-if="goodsInfo.showBuyBtn" @click.stop="showSkuHandler(item)"> <span class="buy" v-if="goodsInfo.showBuyBtn" @click.stop="showSkuHandler(item)">
<u-icon <u-icon name="cart-o" size="40" :color="mainColor" v-if="goodsInfo.buyBtn == 'cart'" />
name="cart-o" <u-icon name="add-o" size="40" :color="mainColor" v-else-if="goodsInfo.buyBtn == 'add'" />
size="40"
:color="mainColor"
v-if="goodsInfo.buyBtn == 'cart'"
/>
<u-icon
name="add-o"
size="40"
:color="mainColor"
v-else-if="goodsInfo.buyBtn == 'add'"
/>
<u-button <u-button
type="primary" type="primary"
size="mini" size="mini"
:ripple="true" :ripple="true"
:color="goodsInfo.buttonColor" :color="goodsInfo.buttonColor"
:custom-style="`backgroundColor:${goodsInfo.buttonColor},color:${ :custom-style="
goodsInfo.buyBtnStyle == 2 || goodsInfo.buyBtnStyle == 4 `backgroundColor:${goodsInfo.buttonColor},color:${goodsInfo.buyBtnStyle == 2 || goodsInfo.buyBtnStyle == 4 ? goodsInfo.buttonColor : '#FFF'}`
? goodsInfo.buttonColor
: '#FFF'
}`"
:plain="goodsInfo.buyBtnStyle == 2 || goodsInfo.buyBtnStyle == 4"
:shape="
goodsInfo.buyBtnStyle == 3 || goodsInfo.buyBtnStyle == 4
? 'circle'
: 'square'
" "
:plain="goodsInfo.buyBtnStyle == 2 || goodsInfo.buyBtnStyle == 4"
:shape="goodsInfo.buyBtnStyle == 3 || goodsInfo.buyBtnStyle == 4 ? 'circle' : 'square'"
v-else v-else
>{{ goodsInfo.buyBtnText }}</u-button
> >
{{ goodsInfo.buyBtnText }}
</u-button>
</span> </span>
</div> </div>
</div> </div>
</div> </div>
<good-sku v-if="showSku" :option-type="2" borderRadius="20" v-model="showSku" :good="sku"></good-sku> <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>
</div> </div>
</template> </template>
<script> <script>
import goodSku from '../goods/goodsku' import goodSku from '../goods/goodsku';
import auth from '@/components/auth/index.vue';
export default { export default {
components:{ components: {
goodSku goodSku,
auth
}, },
props: ["goodList", "goodsInfo"], props: ['goodList', 'goodsInfo'],
data() { data() {
return { return {
mainColor: "", mainColor: '',
activeKey: 0, activeKey: 0,
showSku:false, showSku: false,
sku:{} sku: {},
showAuth: false,
u: {}
}; };
}, },
created() { created() {
...@@ -108,13 +87,30 @@ export default { ...@@ -108,13 +87,30 @@ export default {
}, },
methods: { methods: {
openGood(item) { openGood(item) {
uni.navigateTo({ url: '/pages/goods/goods?GoodsId='+item.id}); uni.navigateTo({ url: '/pages/goods/goods?GoodsId=' + item.id });
}, },
showSkuHandler(g){ showSkuHandler(g) {
this.sku=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> </script>
......
components/goods/style2.vue
View file @ 1874162d
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
:style="{ :style="{
'background-color': goodsInfo.backgroundColor, 'background-color': goodsInfo.backgroundColor,
'background-image': goodsInfo.backgroundPicUrl, 'background-image': goodsInfo.backgroundPicUrl,
'border-color': goodsInfo.goodsStyle == 2 ? 'rgb(226, 226, 226)' : '', 'border-color': goodsInfo.goodsStyle == 2 ? 'rgb(226, 226, 226)' : ''
}" }"
> >
<u-row gutter="24"> <u-row gutter="24">
...@@ -13,17 +13,11 @@ ...@@ -13,17 +13,11 @@
class="good-two" class="good-two"
@click="openGood(item)" @click="openGood(item)"
:style="{ :style="{
border: border: goodsInfo.goodsStyle == 2 ? '1px solid rgb(226, 226, 226)' : '',
goodsInfo.goodsStyle == 2 ? '1px solid rgb(226, 226, 226)' : '', background: goodsInfo.goodsStyle == 1 || goodsInfo.goodsStyle == 2 ? '#FFF' : ''
background:
goodsInfo.goodsStyle == 1 || goodsInfo.goodsStyle == 2
? '#FFF'
: '',
}" }"
> >
<view class="tips" v-if="goodsInfo.showGoodsTag"> <view class="tips" v-if="goodsInfo.showGoodsTag"><image :src="goodsInfo.goodsTagPicUrl" mode="widthFix" style="width:100%" /></view>
<image :src="goodsInfo.goodsTagPicUrl" mode="widthFix" style="width:100%" />
</view>
<view class="img-box"> <view class="img-box">
<view class="img-show"> <view class="img-show">
<image <image
...@@ -38,65 +32,56 @@ ...@@ -38,65 +32,56 @@
</view> </view>
</view> </view>
<view class="good-info"> <view class="good-info">
<view class="good-name" v-if="goodsInfo.showGoodsName"> <view class="good-name" v-if="goodsInfo.showGoodsName">{{ item.name }}</view>
{{ item.name }}
</view>
<view class="good-price-info"> <view class="good-price-info">
<view class="price" :style="{'color':mainColor}">{{ <view class="price" :style="{ color: mainColor }">{{ goodsInfo.showGoodsPrice ? getPrice(item.price) : '' }}</view>
goodsInfo.showGoodsPrice ? getPrice(item.price) : "" <view class="buy" v-if="goodsInfo.showBuyBtn" @click.stop="showSkuHandler(item)">
}}</view> <u-icon name="cart-o" size="40" :color="mainColor" v-if="goodsInfo.buyBtn == 'cart'" />
<view class="buy" v-if="goodsInfo.showBuyBtn"> <u-icon name="add-o" size="40" :color="mainColor" v-else-if="goodsInfo.buyBtn == 'add'" />
<u-icon
name="cart-o"
size="40"
:color="mainColor"
v-if="goodsInfo.buyBtn == 'cart'"
/>
<u-icon
name="add-o"
size="40"
:color="mainColor"
v-else-if="goodsInfo.buyBtn == 'add'"
/>
<u-button <u-button
type="primary" type="primary"
size="mini" size="mini"
:ripple="true" :ripple="true"
:color="goodsInfo.buttonColor" :color="goodsInfo.buttonColor"
:custom-style="`backgroundColor:${ :custom-style="
goodsInfo.buttonColor `backgroundColor:${goodsInfo.buttonColor},color:${
},color:${ goodsInfo.buyBtnStyle == 2 || goodsInfo.buyBtnStyle == 4 ? goodsInfo.buttonColor : '#FFF'
goodsInfo.buyBtnStyle == 2 || goodsInfo.buyBtnStyle == 4 }`
? goodsInfo.buttonColor
: '#FFF'
}`"
:plain="
goodsInfo.buyBtnStyle == 2 || goodsInfo.buyBtnStyle == 4
"
:shape="
goodsInfo.buyBtnStyle == 3 || goodsInfo.buyBtnStyle == 4
? 'circle'
: 'square'
" "
:plain="goodsInfo.buyBtnStyle == 2 || goodsInfo.buyBtnStyle == 4"
:shape="goodsInfo.buyBtnStyle == 3 || goodsInfo.buyBtnStyle == 4 ? 'circle' : 'square'"
v-else v-else
>{{ goodsInfo.buyBtnText }}</u-button
> >
{{ goodsInfo.buyBtnText }}
</u-button>
</view> </view>
</view> </view>
</view> </view>
</view> </view>
</u-col> </u-col>
</u-row> </u-row>
<good-sku v-if="showSku" borderRadius="20" v-model="showSku" :good="sku" :option-type="2"></good-sku>
<auth v-if="showAuth" @changeuserinfo="reloadUserinfo" @gbAuth="gbAuth"></auth>
</view> </view>
</template> </template>
<script> <script>
import goodSku from '../goods/goodsku';
import auth from '@/components/auth/index.vue';
export default { export default {
props: ["goodList", "goodsInfo"], components: {
goodSku,
auth
},
props: ['goodList', 'goodsInfo'],
data() { data() {
return { return {
mainColor: "", mainColor: '',
activeKey: 0, activeKey: 0,
showSku: false,
sku: {},
showAuth: false,
u: {}
}; };
}, },
created() { created() {
...@@ -104,9 +89,30 @@ export default { ...@@ -104,9 +89,30 @@ export default {
}, },
methods: { methods: {
openGood(item) { openGood(item) {
uni.navigateTo({ url: '/pages/goods/goods?GoodsId='+item.id}); uni.navigateTo({ url: '/pages/goods/goods?GoodsId=' + item.id });
},
showSkuHandler(g) {
this.sku = g;
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> </script>
...@@ -166,7 +172,7 @@ export default { ...@@ -166,7 +172,7 @@ export default {
-webkit-box-orient: vertical; -webkit-box-orient: vertical;
margin: 3px 0; margin: 3px 0;
font-size: 13px; font-size: 13px;
min-height:35px; min-height: 35px;
} }
.good-two .good-info .good-price-info { .good-two .good-info .good-price-info {
display: flex; display: flex;
......
components/goods/style3.vue
View file @ 1874162d
...@@ -4,26 +4,20 @@ ...@@ -4,26 +4,20 @@
:style="{ :style="{
'background-color': goodsInfo.backgroundColor, 'background-color': goodsInfo.backgroundColor,
'background-image': goodsInfo.backgroundPicUrl, 'background-image': goodsInfo.backgroundPicUrl,
'border-color': goodsInfo.goodsStyle == 2 ? 'rgb(226, 226, 226)' : '', 'border-color': goodsInfo.goodsStyle == 2 ? 'rgb(226, 226, 226)' : ''
}" }"
> >
<u-row gutter="24"> <u-row gutter="24">
<u-col <u-col span="4" v-for="(item, gli) in goodList" :key="gli">
span="4" <div
v-for="(item, gli) in goodList" class="good-three"
:key="gli" @click="openGood(item)"
:style="{
border: goodsInfo.goodsStyle == 2 ? '1px solid rgb(226, 226, 226)' : '',
background: goodsInfo.goodsStyle == 1 || goodsInfo.goodsStyle == 2 ? '#FFF' : ''
}"
> >
<div class="good-three" @click="openGood(item)" :style="{ <div class="tips" v-if="goodsInfo.showGoodsTag"><image :src="goodsInfo.goodsTagPicUrl" mode="widthFix" style="width:100%" /></div>
border:
goodsInfo.goodsStyle == 2 ? '1px solid rgb(226, 226, 226)' : '',
background:
goodsInfo.goodsStyle == 1 || goodsInfo.goodsStyle == 2
? '#FFF'
: '',
}">
<div class="tips" v-if="goodsInfo.showGoodsTag">
<image :src="goodsInfo.goodsTagPicUrl" mode="widthFix" style="width:100%" />
</div>
<div class="img-box"> <div class="img-box">
<div class="img-show"> <div class="img-show">
<image <image
...@@ -38,49 +32,28 @@ ...@@ -38,49 +32,28 @@
</div> </div>
</div> </div>
<div class="good-info"> <div class="good-info">
<div class="good-name" v-if="goodsInfo.showGoodsName"> <div class="good-name" v-if="goodsInfo.showGoodsName">{{ item.name }}</div>
{{ item.name }}
</div>
<div class="good-price-info"> <div class="good-price-info">
<view class="price" :style="{'color':mainColor}">{{ <view class="price" :style="{ color: mainColor }">{{ goodsInfo.showGoodsPrice ? getPrice(item.price) : '' }}</view>
goodsInfo.showGoodsPrice ? getPrice(item.price) : ""
}}</view>
<view class="buy" v-if="goodsInfo.showBuyBtn" @click.stop="showSkuHandler(item)"> <view class="buy" v-if="goodsInfo.showBuyBtn" @click.stop="showSkuHandler(item)">
<u-icon <u-icon name="cart-o" size="40" :color="mainColor" v-if="goodsInfo.buyBtn == 'cart'" />
name="cart-o" <u-icon name="add-o" size="40" :color="mainColor" v-else-if="goodsInfo.buyBtn == 'add'" />
size="40"
:color="mainColor"
v-if="goodsInfo.buyBtn == 'cart'"
/>
<u-icon
name="add-o"
size="40"
:color="mainColor"
v-else-if="goodsInfo.buyBtn == 'add'"
/>
<u-button <u-button
type="primary" type="primary"
size="mini" size="mini"
:ripple="true" :ripple="true"
:color="goodsInfo.buttonColor" :color="goodsInfo.buttonColor"
:custom-style="`backgroundColor:${ :custom-style="
goodsInfo.buttonColor `backgroundColor:${goodsInfo.buttonColor},color:${
},color:${ goodsInfo.buyBtnStyle == 2 || goodsInfo.buyBtnStyle == 4 ? goodsInfo.buttonColor : '#FFF'
goodsInfo.buyBtnStyle == 2 || goodsInfo.buyBtnStyle == 4 }`
? goodsInfo.buttonColor
: '#FFF'
}`"
:plain="
goodsInfo.buyBtnStyle == 2 || goodsInfo.buyBtnStyle == 4
"
:shape="
goodsInfo.buyBtnStyle == 3 || goodsInfo.buyBtnStyle == 4
? 'circle'
: 'square'
" "
:plain="goodsInfo.buyBtnStyle == 2 || goodsInfo.buyBtnStyle == 4"
:shape="goodsInfo.buyBtnStyle == 3 || goodsInfo.buyBtnStyle == 4 ? 'circle' : 'square'"
v-else v-else
>{{ goodsInfo.buyBtnText }}</u-button
> >
{{ goodsInfo.buyBtnText }}
</u-button>
</view> </view>
</div> </div>
</div> </div>
...@@ -88,22 +61,27 @@ ...@@ -88,22 +61,27 @@
</u-col> </u-col>
</u-row> </u-row>
<good-sku v-if="showSku" borderRadius="20" v-model="showSku" :good="sku" :option-type="2"></good-sku> <good-sku v-if="showSku" borderRadius="20" v-model="showSku" :good="sku" :option-type="2"></good-sku>
<auth v-if="showAuth" @changeuserinfo="reloadUserinfo" @gbAuth="gbAuth"></auth>
</div> </div>
</template> </template>
<script> <script>
import goodSku from '../goods/goodsku' import goodSku from '../goods/goodsku';
import auth from '@/components/auth/index.vue';
export default { export default {
components:{ components: {
goodSku goodSku,
auth
}, },
props: ["goodList", "goodsInfo"], props: ['goodList', 'goodsInfo'],
data() { data() {
return { return {
mainColor: "", mainColor: '',
activeKey: 0, activeKey: 0,
showSku:false, showSku: false,
sku:{} sku: {},
showAuth: false,
u: {}
}; };
}, },
created() { created() {
...@@ -111,13 +89,30 @@ export default { ...@@ -111,13 +89,30 @@ export default {
}, },
methods: { methods: {
openGood(item) { openGood(item) {
uni.navigateTo({ url: '/pages/goods/goods?GoodsId='+item.id}); uni.navigateTo({ url: '/pages/goods/goods?GoodsId=' + item.id });
}, },
showSkuHandler(g){ showSkuHandler(g) {
this.sku=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> </script>
...@@ -177,8 +172,8 @@ export default { ...@@ -177,8 +172,8 @@ export default {
-webkit-box-orient: vertical; -webkit-box-orient: vertical;
margin: 3px 0; margin: 3px 0;
font-size: 13px; font-size: 13px;
word-break:break-all; word-break: break-all;
min-height:34px; min-height: 34px;
} }
.good-three .good-info .good-price-info { .good-three .good-info .good-price-info {
display: flex; display: flex;
......
components/goods/style4.vue
View file @ 1874162d
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
:style="{ :style="{
'background-color': goodsInfo.backgroundColor, 'background-color': goodsInfo.backgroundColor,
'background-image': goodsInfo.backgroundPicUrl, 'background-image': goodsInfo.backgroundPicUrl,
'border-color': goodsInfo.goodsStyle == 2 ? 'rgb(226, 226, 226)' : '', 'border-color': goodsInfo.goodsStyle == 2 ? 'rgb(226, 226, 226)' : ''
}" }"
> >
<view <view
...@@ -14,85 +14,58 @@ ...@@ -14,85 +14,58 @@
@click="openGood(item)" @click="openGood(item)"
:style="{ :style="{
border: goodsInfo.goodsStyle == 2 ? '1px solid rgb(226, 226, 226)' : '', border: goodsInfo.goodsStyle == 2 ? '1px solid rgb(226, 226, 226)' : '',
background: background: goodsInfo.goodsStyle == 1 || goodsInfo.goodsStyle == 2 ? '#FFF' : ''
goodsInfo.goodsStyle == 1 || goodsInfo.goodsStyle == 2 ? '#FFF' : '',
}" }"
> >
<view class="tips" v-if="goodsInfo.showGoodsTag"> <view class="tips" v-if="goodsInfo.showGoodsTag"><image :src="goodsInfo.goodsTagPicUrl" mode="widthFix" style="width: 100%;" /></view>
<image <view class="img-box"><image style="width: 100%; height: 100%;" :mode="goodsInfo.fill == 1 ? 'aspectFill' : 'aspectFit'" :src="item.picUrl" /></view>
:src="goodsInfo.goodsTagPicUrl"
mode="widthFix"
style="width: 100%;"
/>
</view>
<view class="img-box">
<image
style="width: 100%; height: 100%;"
:mode="goodsInfo.fill == 1 ? 'aspectFill' : 'aspectFit'"
:src="item.picUrl"
/>
</view>
<view class="good-info"> <view class="good-info">
<view class="good-name" v-if="goodsInfo.showGoodsName">{{ <view class="good-name" v-if="goodsInfo.showGoodsName">{{ item.name }}</view>
item.name
}}</view>
<view class="good-price-info"> <view class="good-price-info">
<view class="price" :style="{'color':mainColor}">{{ <view class="price" :style="{ color: mainColor }">{{ goodsInfo.showGoodsPrice ? getPrice(item.price) : '' }}</view>
goodsInfo.showGoodsPrice ? getPrice(item.price) : ""
}}</view>
<view class="buy" v-if="goodsInfo.showBuyBtn" @click.stop="showSkuHandler(item)"> <view class="buy" v-if="goodsInfo.showBuyBtn" @click.stop="showSkuHandler(item)">
<u-icon <u-icon name="cart-o" size="40" :color="mainColor" v-if="goodsInfo.buyBtn == 'cart'" />
name="cart-o" <u-icon name="add-o" size="40" :color="mainColor" v-else-if="goodsInfo.buyBtn == 'add'" />
size="40"
:color="mainColor"
v-if="goodsInfo.buyBtn == 'cart'"
/>
<u-icon
name="add-o"
size="40"
:color="mainColor"
v-else-if="goodsInfo.buyBtn == 'add'"
/>
<u-button <u-button
type="primary" type="primary"
size="mini" size="mini"
:ripple="true" :ripple="true"
:color="goodsInfo.buttonColor" :color="goodsInfo.buttonColor"
:custom-style="`backgroundColor:${goodsInfo.buttonColor},color:${ :custom-style="
goodsInfo.buyBtnStyle == 2 || goodsInfo.buyBtnStyle == 4 `backgroundColor:${goodsInfo.buttonColor},color:${goodsInfo.buyBtnStyle == 2 || goodsInfo.buyBtnStyle == 4 ? goodsInfo.buttonColor : '#FFF'}`
? goodsInfo.buttonColor
: '#FFF'
}`"
:plain="goodsInfo.buyBtnStyle == 2 || goodsInfo.buyBtnStyle == 4"
:shape="
goodsInfo.buyBtnStyle == 3 || goodsInfo.buyBtnStyle == 4
? 'circle'
: 'square'
" "
:plain="goodsInfo.buyBtnStyle == 2 || goodsInfo.buyBtnStyle == 4"
:shape="goodsInfo.buyBtnStyle == 3 || goodsInfo.buyBtnStyle == 4 ? 'circle' : 'square'"
v-else v-else
>{{ goodsInfo.buyBtnText }}</u-button
> >
{{ goodsInfo.buyBtnText }}
</u-button>
</view> </view>
</view> </view>
</view> </view>
</view> </view>
<good-sku v-if="showSku" :option-type="2" borderRadius="20" v-model="showSku" :good="sku"></good-sku> <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> </view>
</template> </template>
<script> <script>
import goodSku from '../goods/goodsku' import goodSku from '../goods/goodsku';
import auth from '@/components/auth/index.vue';
export default { export default {
components:{ components: {
goodSku goodSku,
auth
}, },
props: ["goodList", "goodsInfo"], props: ['goodList', 'goodsInfo'],
data() { data() {
return { return {
mainColor: "", mainColor: '',
activeKey: 0, activeKey: 0,
showSku:false, showSku: false,
sku:{} sku: {},
showAuth: false,
u: {}
}; };
}, },
created() { created() {
...@@ -100,12 +73,29 @@ export default { ...@@ -100,12 +73,29 @@ export default {
}, },
methods: { methods: {
openGood(item) { openGood(item) {
uni.navigateTo({ url: '/pages/goods/goods?GoodsId='+item.id}); uni.navigateTo({ url: '/pages/goods/goods?GoodsId=' + item.id });
}, },
showSkuHandler(g){ showSkuHandler(g) {
this.sku=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;
}
//格式化价格添加.00 //格式化价格添加.00
// getPrice(value){ // getPrice(value){
// var html,_val; // var html,_val;
...@@ -119,7 +109,7 @@ export default { ...@@ -119,7 +109,7 @@ export default {
// _val = value.split('.'); // _val = value.split('.');
// return html = '￥'+_val[0]+'.'+_val[1]; // return html = '￥'+_val[0]+'.'+_val[1];
// } // }
}, }
}; };
</script> </script>
......
components/goods/style5.vue
View file @ 1874162d
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
:style="{ :style="{
'background-color': goodsInfo.backgroundColor, 'background-color': goodsInfo.backgroundColor,
'background-image': goodsInfo.backgroundPicUrl, 'background-image': goodsInfo.backgroundPicUrl,
'border-color': goodsInfo.goodsStyle == 2 ? 'rgb(226, 226, 226)' : '', 'border-color': goodsInfo.goodsStyle == 2 ? 'rgb(226, 226, 226)' : ''
}" }"
> >
<view <view
...@@ -13,87 +13,62 @@ ...@@ -13,87 +13,62 @@
v-for="(item, gli) in goodList" v-for="(item, gli) in goodList"
:key="gli" :key="gli"
:style="{ :style="{
'border': goodsInfo.goodsStyle == 2 ? '1px solid rgb(226, 226, 226)' : '', border: goodsInfo.goodsStyle == 2 ? '1px solid rgb(226, 226, 226)' : '',
background: background: goodsInfo.goodsStyle == 1 || goodsInfo.goodsStyle == 2 ? '#FFF' : ''
goodsInfo.goodsStyle == 1 || goodsInfo.goodsStyle == 2
? '#FFF'
: '',
}" }"
> >
<view class="tips" v-if="goodsInfo.showGoodsTag"> <view class="tips" v-if="goodsInfo.showGoodsTag"><image :src="goodsInfo.goodsTagPicUrl" mode="widthFix" style="width:100%" /></view>
<image :src="goodsInfo.goodsTagPicUrl" mode="widthFix" style="width:100%" />
</view>
<view class="img-box"> <view class="img-box">
<view class="img-show"> <view class="img-show">
<image <image style="width: 100%; height: 100%; border-radius: 10rpx 10rpx 0 0;" :mode="goodsInfo.fill == 1 ? 'aspectFill' : 'aspectFit'" :src="item.picUrl" />
style="width: 100%; height: 100%; border-radius: 10rpx 10rpx 0 0;"
:mode="goodsInfo.fill == 1 ? 'aspectFill' : 'aspectFit'"
:src="item.picUrl"
/>
</view>
</view> </view>
<view
class="good-info"
>
<view class="good-name" v-if="goodsInfo.showGoodsName">
{{ item.name }}
</view> </view>
<view class="good-info">
<view class="good-name" v-if="goodsInfo.showGoodsName">{{ item.name }}</view>
<view class="good-price-info"> <view class="good-price-info">
<view class="price" :style="{'color':mainColor}">{{ <view class="price" :style="{ color: mainColor }">{{ goodsInfo.showGoodsPrice ? getPrice(item.price) : '' }}</view>
goodsInfo.showGoodsPrice ? getPrice(item.price) : ""
}}</view>
<view class="buy" v-if="goodsInfo.showBuyBtn" @click.stop="showSkuHandler(item)"> <view class="buy" v-if="goodsInfo.showBuyBtn" @click.stop="showSkuHandler(item)">
<u-icon <u-icon name="cart-o" size="40" :color="mainColor" v-if="goodsInfo.buyBtn == 'cart'" />
name="cart-o" <u-icon name="add-o" size="40" :color="mainColor" v-else-if="goodsInfo.buyBtn == 'add'" />
size="40"
:color="mainColor"
v-if="goodsInfo.buyBtn == 'cart'"
/>
<u-icon
name="add-o"
size="40"
:color="mainColor"
v-else-if="goodsInfo.buyBtn == 'add'"
/>
<u-button <u-button
type="primary" type="primary"
size="mini" size="mini"
:ripple="true" :ripple="true"
:color="goodsInfo.buttonColor" :color="goodsInfo.buttonColor"
:custom-style="`backgroundColor:${goodsInfo.buttonColor},color:${ :custom-style="
goodsInfo.buyBtnStyle == 2 || goodsInfo.buyBtnStyle == 4 `backgroundColor:${goodsInfo.buttonColor},color:${goodsInfo.buyBtnStyle == 2 || goodsInfo.buyBtnStyle == 4 ? goodsInfo.buttonColor : '#FFF'}`
? goodsInfo.buttonColor
: '#FFF'
}`"
:plain="goodsInfo.buyBtnStyle == 2 || goodsInfo.buyBtnStyle == 4"
:shape="
goodsInfo.buyBtnStyle == 3 || goodsInfo.buyBtnStyle == 4
? 'circle'
: 'square'
" "
:plain="goodsInfo.buyBtnStyle == 2 || goodsInfo.buyBtnStyle == 4"
:shape="goodsInfo.buyBtnStyle == 3 || goodsInfo.buyBtnStyle == 4 ? 'circle' : 'square'"
v-else v-else
>{{ goodsInfo.buyBtnText }}</u-button
> >
{{ goodsInfo.buyBtnText }}
</u-button>
</view> </view>
</view> </view>
</view> </view>
</view> </view>
<good-sku v-if="showSku" :option-type="2" borderRadius="20" v-model="showSku" :good="sku"></good-sku> <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> </view>
</template> </template>
<script> <script>
import goodSku from '../goods/goodsku' import goodSku from '../goods/goodsku';
import auth from '@/components/auth/index.vue';
export default { export default {
components:{ components: {
goodSku goodSku,
auth
}, },
props: ["goodList", "goodsInfo"], props: ['goodList', 'goodsInfo'],
data() { data() {
return { return {
mainColor: "", mainColor: '',
activeKey: 0, activeKey: 0,
showSku:false, showSku: false,
sku:{} sku: {},
showAuth: false,
u: {}
}; };
}, },
created() { created() {
...@@ -101,13 +76,30 @@ export default { ...@@ -101,13 +76,30 @@ export default {
}, },
methods: { methods: {
openGood(item) { openGood(item) {
uni.navigateTo({ url: '/pages/goods/goods?GoodsId='+item.id}); uni.navigateTo({ url: '/pages/goods/goods?GoodsId=' + item.id });
}, },
showSkuHandler(g){ showSkuHandler(g) {
this.sku=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> </script>
......
components/goods/style6.vue
View file @ 1874162d
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
:style="{ :style="{
'background-color': goodsInfo.backgroundColor, 'background-color': goodsInfo.backgroundColor,
'background-image': goodsInfo.backgroundPicUrl, 'background-image': goodsInfo.backgroundPicUrl,
'border-color': goodsInfo.goodsStyle == 2 ? 'rgb(226, 226, 226)' : '', 'border-color': goodsInfo.goodsStyle == 2 ? 'rgb(226, 226, 226)' : ''
}" }"
> >
<view <view
...@@ -14,78 +14,58 @@ ...@@ -14,78 +14,58 @@
@click="openGood(item)" @click="openGood(item)"
:style="{ :style="{
border: goodsInfo.goodsStyle == 2 ? '1px solid rgb(226, 226, 226)' : '', border: goodsInfo.goodsStyle == 2 ? '1px solid rgb(226, 226, 226)' : '',
background: background: goodsInfo.goodsStyle == 1 || goodsInfo.goodsStyle == 2 ? '#FFF' : ''
goodsInfo.goodsStyle == 1 || goodsInfo.goodsStyle == 2 ? '#FFF' : '',
}" }"
> >
<view class="tips" v-if="goodsInfo.showGoodsTag"> <view class="tips" v-if="goodsInfo.showGoodsTag"><image :src="goodsInfo.goodsTagPicUrl" mode="widthFix" style="width: 100%;" /></view>
<image <view class="img-box"><image style="width: 100%; height: 100%;" :mode="goodsInfo.fill == 1 ? 'aspectFill' : 'aspectFit'" :src="item.picUrl" /></view>
:src="goodsInfo.goodsTagPicUrl"
mode="widthFix"
style="width: 100%;"
/>
</view>
<view class="img-box">
<image
style="width: 100%; height: 100%;"
:mode="goodsInfo.fill == 1 ? 'aspectFill' : 'aspectFit'"
:src="item.picUrl"
/>
</view>
<view class="good-info"> <view class="good-info">
<view class="good-name" v-if="goodsInfo.showGoodsName">{{ <view class="good-name" v-if="goodsInfo.showGoodsName">{{ item.name }}</view>
item.name
}}</view>
<view class="good-price-info"> <view class="good-price-info">
<view class="price" :style="{'color':mainColor}">{{ <view class="price" :style="{ color: mainColor }">{{ goodsInfo.showGoodsPrice ? getPrice(item.price) : '' }}</view>
goodsInfo.showGoodsPrice ? getPrice(item.price) : "" <view class="buy" v-if="goodsInfo.showBuyBtn" @click.stop="showSkuHandler(item)">
}}</view> <u-icon name="cart-o" size="40" :color="mainColor" v-if="goodsInfo.buyBtn == 'cart'" />
<view class="buy" v-if="goodsInfo.showBuyBtn"> <u-icon name="add-o" size="40" :color="mainColor" v-else-if="goodsInfo.buyBtn == 'add'" />
<u-icon
name="cart-o"
size="40"
:color="mainColor"
v-if="goodsInfo.buyBtn == 'cart'"
/>
<u-icon
name="add-o"
size="40"
:color="mainColor"
v-else-if="goodsInfo.buyBtn == 'add'"
/>
<u-button <u-button
type="primary" type="primary"
size="mini" size="mini"
:ripple="true" :ripple="true"
:color="goodsInfo.buttonColor" :color="goodsInfo.buttonColor"
:custom-style="`backgroundColor:${goodsInfo.buttonColor},color:${ :custom-style="
goodsInfo.buyBtnStyle == 2 || goodsInfo.buyBtnStyle == 4 `backgroundColor:${goodsInfo.buttonColor},color:${goodsInfo.buyBtnStyle == 2 || goodsInfo.buyBtnStyle == 4 ? goodsInfo.buttonColor : '#FFF'}`
? goodsInfo.buttonColor
: '#FFF'
}`"
:plain="goodsInfo.buyBtnStyle == 2 || goodsInfo.buyBtnStyle == 4"
:shape="
goodsInfo.buyBtnStyle == 3 || goodsInfo.buyBtnStyle == 4
? 'circle'
: 'square'
" "
:plain="goodsInfo.buyBtnStyle == 2 || goodsInfo.buyBtnStyle == 4"
:shape="goodsInfo.buyBtnStyle == 3 || goodsInfo.buyBtnStyle == 4 ? 'circle' : 'square'"
v-else v-else
>{{ goodsInfo.buyBtnText }}</u-button
> >
{{ goodsInfo.buyBtnText }}
</u-button>
</view> </view>
</view> </view>
</view> </view>
</view> </view>
<good-sku v-if="showSku" borderRadius="20" v-model="showSku" :good="sku" :option-type="2"></good-sku>
<auth v-if="showAuth" @changeuserinfo="reloadUserinfo" @gbAuth="gbAuth"></auth>
</view> </view>
</template> </template>
<script> <script>
import goodSku from '../goods/goodsku';
import auth from '@/components/auth/index.vue';
export default { export default {
props: ["goodList", "goodsInfo"], components: {
goodSku,
auth
},
props: ['goodList', 'goodsInfo'],
data() { data() {
return { return {
mainColor: "", mainColor: '',
activeKey: 0, activeKey: 0,
showSku: false,
sku: {},
showAuth: false,
u: {}
}; };
}, },
created() { created() {
...@@ -93,9 +73,30 @@ export default { ...@@ -93,9 +73,30 @@ export default {
}, },
methods: { methods: {
openGood(item) { openGood(item) {
uni.navigateTo({ url: '/pages/goods/goods?GoodsId='+item.id}); uni.navigateTo({ url: '/pages/goods/goods?GoodsId=' + item.id });
},
showSkuHandler(g) {
this.sku = g;
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> </script>
......
components/rubik/index.vue
View file @ 1874162d
...@@ -28,8 +28,7 @@ export default { ...@@ -28,8 +28,7 @@ export default {
backgroundImage: x.backgroundImage, backgroundImage: x.backgroundImage,
backgroundRepeat: x.backgroundRepeat, backgroundRepeat: x.backgroundRepeat,
backgroundSize: x.backgroundSize, backgroundSize: x.backgroundSize,
backgroundPosition: x.backgroundPosition, backgroundPosition: x.backgroundPosition
border:'1px solid red'
}; };
if (this.ad.height == "auto") { if (this.ad.height == "auto") {
x.formatStyle.position = "unset"; x.formatStyle.position = "unset";
......
pages/goods/components/share/share.vue
View file @ 1874162d
...@@ -66,7 +66,7 @@ export default { ...@@ -66,7 +66,7 @@ export default {
type: Boolean, type: Boolean,
default: true, default: true,
}, },
id: { goodId: {
type: Number, type: Number,
default: 0, default: 0,
}, },
...@@ -99,6 +99,7 @@ export default { ...@@ -99,6 +99,7 @@ export default {
this.downLoadImage(arr); this.downLoadImage(arr);
}, },
genernalHandler() { genernalHandler() {
//this.goodId
uni.navigateTo({ uni.navigateTo({
url: "/pages/goods/draw", url: "/pages/goods/draw",
}); });
......
pages/goods/goods.vue
View file @ 1874162d
...@@ -219,7 +219,7 @@ ...@@ -219,7 +219,7 @@
v-if="!isExsitGoods" v-if="!isExsitGoods"
></u-empty> ></u-empty>
<share <share
:id="id" :good-id="id"
v-if="showShare" v-if="showShare"
:good-name="g.name" :good-name="g.name"
:images="g.pic_url" :images="g.pic_url"
......
pages/index/index.vue
View file @ 1874162d
...@@ -98,6 +98,7 @@ export default { ...@@ -98,6 +98,7 @@ export default {
mainColor: "", mainColor: "",
active: 0, active: 0,
contentHeight: 0, contentHeight: 0,
pageId:0
}; };
}, },
components: { components: {
...@@ -120,7 +121,11 @@ export default { ...@@ -120,7 +121,11 @@ export default {
addialog, addialog,
quicknav quicknav
}, },
onLoad() { onLoad(options) {
console.log(options,'option');
if(options&&options.page_id){
this.pageId=options.page_id
}
let c = this.$uiConfig.is_bang ? 78 : 50; let c = this.$uiConfig.is_bang ? 78 : 50;
this.contentHeight = this.$utils.calcContentHeight(c); this.contentHeight = this.$utils.calcContentHeight(c);
this.init(); this.init();
...@@ -138,6 +143,7 @@ export default { ...@@ -138,6 +143,7 @@ export default {
{ {
url: '/api/Mall/GetHome', url: '/api/Mall/GetHome',
data: { data: {
page_id:this.pageId
}, },
}, },
(res) => { (res) => {
......
pages/order/after-sale/refunds-detail.vue
View file @ 1874162d
...@@ -106,11 +106,11 @@ ...@@ -106,11 +106,11 @@
<view class="reason">{{ d.remark }}</view> <view class="reason">{{ d.remark }}</view>
<view class="grid-reasion"> <view class="grid-reasion">
<image <image
v-for="(x, i) in d.pic_list" v-for="(x, i) in d.VoucherList"
:key="i" :key="i"
:src="x" :src="x"
class="img" class="img"
@click="previewImage(i, d.pic_list)" @click="previewImage(i, d.VoucherList)"
mode="aspectFill" mode="aspectFill"
/> />
</view> </view>
...@@ -118,16 +118,16 @@ ...@@ -118,16 +118,16 @@
<view style="margin-top: 40rpx;" class="block"> <view style="margin-top: 40rpx;" class="block">
<view class="filed center"> <view class="filed center">
<view class="key">服务单号</view> <view class="key">服务单号</view>
<view class="val" style="font-size: 24rpx;">{{ d.order_no }}</view> <view class="val" style="font-size: 24rpx;">{{ d.ReOrderNo }}</view>
<view class="op"> <view class="op">
<u-button size="mini" shape="circle" @click="paste(d.order_no)" <u-button size="mini" shape="circle" @click="paste(d.ReOrderNo)"
>复制</u-button >复制</u-button
> >
</view> </view>
</view> </view>
<view class="filed"> <view class="filed">
<view class="key">申请时间</view> <view class="key">申请时间</view>
<view class="val">{{ d.created_at }}</view> <view class="val">{{ d.CreateDate }}</view>
</view> </view>
<view class="filed split"> <view class="filed split">
<view class="key">服务类型</view> <view class="key">服务类型</view>
...@@ -166,7 +166,7 @@ ...@@ -166,7 +166,7 @@
<view class="key">快递公司</view> <view class="key">快递公司</view>
<view class="val" @click="showExpressHandler"> <view class="val" @click="showExpressHandler">
<text <text
v-if="forms.expressId == -1" v-if="forms.ExpressId == -1"
style="font-size: 13px; color: gray;" style="font-size: 13px; color: gray;"
>请选择快递公司</text >请选择快递公司</text
> >
...@@ -187,7 +187,7 @@ ...@@ -187,7 +187,7 @@
<view class="val"> <view class="val">
<input <input
type="text" type="text"
v-model="forms.expressNo" v-model="forms.ExpressNumber"
placeholder="请输入快递单号" placeholder="请输入快递单号"
/> />
</view> </view>
...@@ -284,8 +284,9 @@ export default { ...@@ -284,8 +284,9 @@ export default {
expressList: [], expressList: [],
showExpress: false, showExpress: false,
forms: { forms: {
expressId: -1, ReOrderId:-1,
expressNo: "", ExpressId: -1,
ExpressNumber: "",
expressName: "", expressName: "",
}, },
currentStatus: 0, currentStatus: 0,
...@@ -332,9 +333,9 @@ export default { ...@@ -332,9 +333,9 @@ export default {
tmplIds: that.d.template_message_list, tmplIds: that.d.template_message_list,
complete(res) { complete(res) {
let msg = ""; let msg = "";
if (that.forms.expressId == -1) { if (that.forms.ExpressId == -1) {
msg = "请选择快递公司"; msg = "请选择快递公司";
} else if (that.forms.expressNo == "") { } else if (that.forms.ExpressNumber == "") {
msg = "请输入快递单号"; msg = "请输入快递单号";
} }
if (msg == "") { if (msg == "") {
...@@ -349,7 +350,7 @@ export default { ...@@ -349,7 +350,7 @@ export default {
id: that.id, id: that.id,
express: that.forms.expressName, express: that.forms.expressName,
customer_name: "", customer_name: "",
express_no: that.forms.expressNo, express_no: that.forms.ExpressNumber,
}, },
method: "POST", method: "POST",
}, },
...@@ -386,7 +387,7 @@ export default { ...@@ -386,7 +387,7 @@ export default {
this.showExpress = true; this.showExpress = true;
}, },
chosenExpressHandler(i) { chosenExpressHandler(i) {
this.forms.expressId = this.expressList[i[0]].id; this.forms.ExpressId = this.expressList[i[0]].id;
this.forms.expressName = this.expressList[i[0]].name; this.forms.expressName = this.expressList[i[0]].name;
}, },
previewImage(i, images) { previewImage(i, images) {
...@@ -412,7 +413,7 @@ export default { ...@@ -412,7 +413,7 @@ export default {
}, },
init() { init() {
this.isover = false; this.isover = false;
let h = this.apiheader();
this.request2( this.request2(
{ {
url: '/api/AppletOrder/GetAppletOrderAfterSaleInfo', url: '/api/AppletOrder/GetAppletOrderAfterSaleInfo',
...@@ -422,10 +423,10 @@ export default { ...@@ -422,10 +423,10 @@ export default {
}, },
(res) => { (res) => {
this.d = res.data; this.d = res.data;
this.expressList = res.data.OrderInfo;
this.loading = false; this.loading = false;
this.currentStatus = this.d.ReOrderStatus - 1; this.currentStatus = this.d.ReOrderStatus - 1;
this.getExpressInfo()
// if (this.d.ReOrderStatusName == 1) { // if (this.d.ReOrderStatusName == 1) {
// this.currentStatus += 1; // this.currentStatus += 1;
// } else if (this.d.ReOrderStatusName == "待退款" || this.d.status_text == "已换货") { // } else if (this.d.ReOrderStatusName == "待退款" || this.d.status_text == "已换货") {
...@@ -436,6 +437,17 @@ export default { ...@@ -436,6 +437,17 @@ export default {
} }
); );
}, },
getExpressInfo(){
this.request2(
{
url: '/api/appletorder/GetExpressInfo',
data: {}
},
(res) => {
this.expressList = res.data;
}
);
}
}, },
}; };
</script> </script>
......
pages/order/express.vue
View file @ 1874162d
...@@ -3,18 +3,18 @@ ...@@ -3,18 +3,18 @@
<view class="status-box"> <view class="status-box">
<view class="item"> <view class="item">
<view class="name">快递公司：</view> <view class="name">快递公司：</view>
<view class="val">{{ expressInfo.ExpressName }}</view> <view class="val">{{ express }}</view>
</view> </view>
<view class="item"> <view class="item">
<view class="name">运单号：</view> <view class="name">运单号：</view>
<view class="val">{{ expressInfo.ExpressNumber }}</view> <view class="val">{{ express_no }}</view>
</view> </view>
<view class="item"> <!-- <view class="item">
<view class="name">运送状态：</view> <view class="name">运送状态：</view>
<view class="val" :style="{ color: mainColor }">{{ <view class="val" :style="{ color: mainColor }">{{
expressInfo.Remark d.status_text
}}</view> }}</view>
</view> </view> -->
</view> </view>
<view <view
...@@ -48,7 +48,7 @@ ...@@ -48,7 +48,7 @@
</view> </view>
</template> </template>
</u-time-line-item> </u-time-line-item>
<u-time-line-item nodeTop="2" v-if="d.status == 3"> <!-- <u-time-line-item nodeTop="2" v-if="d.status == 3">
<template v-slot:node> <template v-slot:node>
<view class="u-node" :style="{ background: mainColor }"> <view class="u-node" :style="{ background: mainColor }">
<u-icon name="success" color="#fff" :size="32"></u-icon> <u-icon name="success" color="#fff" :size="32"></u-icon>
...@@ -61,13 +61,15 @@ ...@@ -61,13 +61,15 @@
<view class="u-order-time">{{ last.datetime }}</view> <view class="u-order-time">{{ last.datetime }}</view>
</view> </view>
</template> </template>
</u-time-line-item> </u-time-line-item> -->
<u-time-line-item v-for="(x, i) in d.list" :key="i"> <u-time-line-item v-for="(x, i) in d" :key="i">
<!-- 此处没有自定义左边的内容，会默认显示一个点 --> <!-- 此处没有自定义左边的内容，会默认显示一个点 -->
<template v-slot:content> <template v-slot:content>
<view style="padding-bottom: 30rpx;" :style="{color:(i==0 && d.status!=3)?'#000 !important':'gray'}"> <view style="padding-bottom: 30rpx;" :style="{color:(i==0)?'#000 !important':'gray'}">
<view class="u-order-desc">{{ x.desc }}</view> <view class="u-order-desc">{{ x.AcceptStation }}</view>
<view class="u-order-time">{{ x.datetime }}</view> <view class="u-order-desc">{{ x.Remark }}</view>
<view class="u-order-time">{{ x.AcceptTime }}</view>
</view> </view>
</template> </template>
</u-time-line-item> </u-time-line-item>
...@@ -81,11 +83,11 @@ export default { ...@@ -81,11 +83,11 @@ export default {
data() { data() {
return { return {
mainColor: "", mainColor: "",
d: {}, d: [],
loading: false, loading: false,
OrderId:0,
last: {}, last: {},
expressInfo:{}, express:'',
express_no:'',
address:'', address:'',
}; };
}, },
...@@ -94,24 +96,48 @@ export default { ...@@ -94,24 +96,48 @@ export default {
title: "物流信息", title: "物流信息",
}); });
this.mainColor = this.$uiConfig.mainColor; this.mainColor = this.$uiConfig.mainColor;
this.OrderId = option.OrderId
// this.express = option.express || "圆通速递"; this.express = option.express || "圆通速递";
// this.express_no = option.no || "YT2042624009816"; this.express_no = option.no || "YT2042624009816";
this.address = option.address || "四川成都市高新西区万景峰二期"; this.address = option.address || "四川成都市高新西区万景峰二期";
this.init(); this.id = option.id || 0;
this.init(this.id,this.express_no);
}, },
methods: { methods: {
init() { init(id,express_no) {
// let h = this.apiheader();
// this.request(
// {
// url: "",
// header: h,
// data: {
// r: "api/order/express-detail",
// express: this.express,
// express_no: this.express_no,
// customer_name: "",
// },
// },
// (res) => {
// this.loading = false;
// this.d = res.data.express;
// this.d.list = this.d.list.reverse();
// if (this.d.status == 3) {
// this.last = this.d.list[0];
// this.d.list.splice(0, 1);
// }
// }
// );
this.request2( this.request2(
{ {
url: '/api/AppletOrder/GetAppletMyOrderExpressInfo', url: "/api/AppletOrder/GetOrderExpressInfo",
data: { data: {
OrderId: this.OrderId ExpressId: id,
} ExpressNumber: express_no,
},
}, },
(res) => { (res) => {
this.expressInfo = res.data
this.d = res.data;
} }
); );
}, },
......
pages/order/order-detail.vue
View file @ 1874162d
...@@ -74,32 +74,33 @@ ...@@ -74,32 +74,33 @@
<view class="good-price">￥{{ x.Final_Price }}</view> <view class="good-price">￥{{ x.Final_Price }}</view>
</view> </view>
</view> </view>
<template v-for="(e, ei) in orders.detailExpress"> <template v-for="(e, ei) in expressInfo">
<view :key="ei" class="order-info-item peisong"> <view :key="ei" class="order-info-item peisong">
<!-- <template v-for="(ec, eci) in e.expressRelation"> <template v-for="(ec, eci) in e.GoodsList">
<view <view
class="field" class="field"
:key="eci" :key="eci"
v-if="e.send_type == '2' && ec.order_detail_id == x.id" v-if="e.Type == '2' && ec.Id == x.DetailId"
> >
<view class="label">配送方式</view> <view class="label">配送方式</view>
<view class="content">{{ e.express_content }}</view> <view class="content">{{ e.Remark }}</view>
</view> </view>
<view <view
class="field" class="field"
:key="eci" :key="eci"
@click="goExpressHandler(e.express, e.express_no)" @click="goExpressHandler(e.ExpressName, e.ExpressNumber,e.ExpressId)"
v-if="e.send_type == '1' && ec.order_detail_id == x.id" v-if="e.Type == '1' && ec.Id == x.DetailId"
> >
<view class="label">配送方式</view> <view class="label">配送方式</view>
<view class="content" <view class="content"
>{{ e.express }} {{ e.express_no }}</view >{{ e.ExpressName }} {{ e.ExpressNumber }}</view
> >
<view style="margin-left: 10px;"> <view style="margin-left: 10px;">
<u-icon name="arrow" size="32" color="#000"></u-icon> <u-icon name="arrow" size="32" color="#000"></u-icon>
</view> </view>
</view> </view>
</template> --> </template>
</view> </view>
</template> </template>
<view <view
...@@ -220,16 +221,6 @@ ...@@ -220,16 +221,6 @@
>立即支付</u-button >立即支付</u-button
> >
</view> </view>
<view class="item" v-if="orders.OrderStatus == '3'||orders.OrderStatus == '4' ">
<u-button
shape="circle"
@click="goExpressHandler(orders)"
size="medium"
:custom-style="customStyle"
>查看物流</u-button
>
</view>
<view class="item" v-if="orders.OrderStatus == '3'"> <view class="item" v-if="orders.OrderStatus == '3'">
<u-button <u-button
shape="circle" shape="circle"
...@@ -363,6 +354,7 @@ export default { ...@@ -363,6 +354,7 @@ export default {
padding: "0 30rpx", padding: "0 30rpx",
color: "#FFF", color: "#FFF",
}, },
expressInfo:[],
Cancelmsg:{ Cancelmsg:{
OrderId:0, OrderId:0,
Type:1, Type:1,
...@@ -399,10 +391,17 @@ export default { ...@@ -399,10 +391,17 @@ export default {
shouhuoHandler() { shouhuoHandler() {
this.showReviceModal = true; this.showReviceModal = true;
}, },
goExpressHandler(orders) {
goExpressHandler(express, no,id) {
uni.navigateTo({ uni.navigateTo({
url: url:
"/pages/order/express?OrderId="+ orders.OrderId+'&address='+orders.DistrictAddress+orders.ShoppingAddress "/pages/order/express?express=" +
express +
"&no=" +
no +
"&address=" +
this.orders.DistrictAddress+this.orders.ShoppingAddress +
"&id=" +id,
}); });
}, },
submitReviceGoodHandler() { submitReviceGoodHandler() {
...@@ -474,6 +473,7 @@ export default { ...@@ -474,6 +473,7 @@ export default {
this.loading = false; this.loading = false;
this.initRecommend(); this.initRecommend();
this.getexpressInfo(res.data.OrderId)
} }
); );
}, },
...@@ -500,6 +500,20 @@ export default { ...@@ -500,6 +500,20 @@ export default {
} }
); );
}, },
getexpressInfo(OrderId){
this.request2(
{
url: "/api/AppletOrder/GetAppletMyOrderExpressInfo",
data: {
OrderId: OrderId,
},
},
(res) => {
this.expressInfo = res.data;
}
);
},
redirectGoods(id) { redirectGoods(id) {
uni.navigateTo({ uni.navigateTo({
url: "/pages/goods/goods?id=" + id, url: "/pages/goods/goods?id=" + id,
......
pages/user-center/user-center.vue
View file @ 1874162d
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
<u-avatar :src="user_info.avatar" size="140" style="margin-left: 50rpx;"></u-avatar> <u-avatar :src="user_info.avatar" size="140" style="margin-left: 50rpx;"></u-avatar>
<view style="display: flex;flex-direction: column;justify-content: center;"> <view style="display: flex;flex-direction: column;justify-content: center;">
<Text style="color: #FFF;margin-left: 20rpx;font-size: 36rpx;" @click="login(user_info)">{{ user_info.nickname ? user_info.nickname : '立即登录' }}</Text> <Text style="color: #FFF;margin-left: 20rpx;font-size: 36rpx;" @click="login(user_info)">{{ user_info.nickname ? user_info.nickname : '立即登录' }}</Text>
<view class="member" @click="goUrl('/pages/member/index/index')"> <view class="member" @click="goUrl('/pages/member/index/index')" v-if='user_info.nickname'>
<image :src="meueData.user_center.top_pic_url" mode='aspectFill' style="width: 26px;height: 26px;border-radius: 13px;"></image> <image :src="meueData.user_center.top_pic_url" mode='aspectFill' style="width: 26px;height: 26px;border-radius: 13px;"></image>
<Text style='margin-right: 10px;'>{{user_info.identity.level_name!=null ?user_info.identity.level_name:'普通用户' }}</Text> <Text style='margin-right: 10px;'>{{user_info.identity.level_name!=null ?user_info.identity.level_name:'普通用户' }}</Text>
</view> </view>
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
<view style="display: flex;flex-direction: column;align-items: center;" v-if="meueData.user_center.top_style == 2"> <view style="display: flex;flex-direction: column;align-items: center;" v-if="meueData.user_center.top_style == 2">
<u-avatar :src="user_info.avatar" size="140"></u-avatar> <u-avatar :src="user_info.avatar" size="140"></u-avatar>
<Text style="color: #FFF;margin-left: 20rpx;font-size: 36rpx;" @click="login(user_info)">{{ user_info.nickname ? user_info.nickname : '立即登录' }}</Text> <Text style="color: #FFF;margin-left: 20rpx;font-size: 36rpx;" @click="login(user_info)">{{ user_info.nickname ? user_info.nickname : '立即登录' }}</Text>
<view class="member" @click="goUrl('/pages/member/index/index')"> <view class="member" @click="goUrl('/pages/member/index/index')" v-if='user_info.nickname'>
<image :src="meueData.user_center.top_pic_url" mode='aspectFill' style="width: 26px;height: 26px;border-radius: 13px;"></image> <image :src="meueData.user_center.top_pic_url" mode='aspectFill' style="width: 26px;height: 26px;border-radius: 13px;"></image>
<Text style='margin-right: 10px;'>{{user_info.identity.level_name!=null ?user_info.identity.level_name:'普通用户' }}</Text> <Text style='margin-right: 10px;'>{{user_info.identity.level_name!=null ?user_info.identity.level_name:'普通用户' }}</Text>
</view> </view>
...@@ -99,8 +99,8 @@ ...@@ -99,8 +99,8 @@
</view> </view>
</view> </view>
<view class="copyright"> <view class="copyright">
<image :src="meueData.user_center.copyright.pic_url" style="width: 95px;height: 28px;"></image> <image :src="meueData.user_center.copyright.pic_url" mode="widthFix" style="width: 95px;"></image>
<Text style="margin-top: 10rpx;">{{ meueData.user_center.copyright.description }}</Text> <Text style="margin-top: 10rpx;color: #666666;">{{ meueData.user_center.copyright.description }}</Text>
</view> </view>
</view> </view>
<auth v-if="showAuth" @changeuserinfo="reloadUserinfo" @gbAuth="gbAuth"></auth> <auth v-if="showAuth" @changeuserinfo="reloadUserinfo" @gbAuth="gbAuth"></auth>
......
plugin/api.js
View file @ 1874162d
export default { export default {
install(Vue, options) { install(Vue, options) {
Vue.prototype.host = "https://wx.weibaoge.cn/web/index.php?_mall_id=1285" //Vue.prototype.host2 = "http://192.168.0.110:8200"
Vue.prototype.host2 = "https://mallApi.oytour.com" Vue.prototype.host2 = "https://mallApi.oytour.com"
//Vue.prototype.host2 = "https://mallApi.oytour.com"
//Vue.prototype.host2 = "http://mallapi.oytour.com"
Vue.prototype.request = function(param, success, failed) {
//网络请求
uni.request({
url: this.host + "&r=" + param.data.r,
method: param.method || "GET",
header: param.header || {
'content-type': "application/json"
},
data: param.data,
success: res => {
if (res.data.code != 0 && res.data.msg != "商品未上架") {
}
typeof success == "function" && success(res.data);
},
fail: (e) => {
console.log("网络请求fail:" + JSON.stringify(e));
uni.showModal({
content: "" + res.errMsg
});
typeof failed == "function" && failed(res.data);
}
});
}
Vue.prototype.request2 = function(param, success, failed) { Vue.prototype.request2 = function(param, success, failed) {
//网络请求 //网络请求
uni.request({ uni.request({
......
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