邓雄飞 4 years ago
parent
commit
88ff1c8a03
5 changed files with 49 additions and 21 deletions
  1. 3
      components/business-components/packingStationItem.vue
  2. 26
      pages/client-list/index.vue
  3. 37
      pages/mall/index.vue
  4. 2
      pages/order-detail/index.vue
  5. 2
      pages/paper-detail/index.vue

3
components/business-components/packingStationItem.vue

@ -55,7 +55,7 @@
</view>
</view>
</view>
<view class="other" @click="selected">
<view class="other">
<view class="box">
<image class="icon" src="/static/imgs/client-list/navigation-icon.png"></image>
<text class="text" style="width: 248rpx">{{ info.detailedAddress || '未知' }}</text>
@ -66,6 +66,7 @@
<text class="text" style="width: 248rpx">{{ info.legalPerson + ' ' + transformPhoneNum(info.contactNumber) }}</text>
</view>
</view>
<slot></slot>
</view>
</template>

26
pages/client-list/index.vue

@ -17,7 +17,13 @@
</qn-header>
<view class="content">
<scroll-list ref="list" :option="option" @load="upCallback" @refresh="downCallback">
<packingStationItem @selected="showModal" style="margin-bottom: 20rpx" v-for="item in list" :key="item.enterpriseId" :info="item"></packingStationItem>
<packingStationItem style="margin-bottom: 20rpx" v-for="item in list" :key="item.enterpriseId" :info="item">
<view class="tax-area flex-row-center-center">
<view class="tax-button flex-row-center-center" @click="showModal">
<text class="text">设置税点</text>
</view>
</view>
</packingStationItem>
</scroll-list>
</view>
<uni-popup ref="popup" type="bottom" @maskClick="closeModal">
@ -322,4 +328,22 @@ export default {
height: 64rpx;
}
}
.tax-area {
width: 750rpx;
height: 100rpx;
padding: 18rpx 32rpx;
border-top: 1px solid rgba(221, 221, 221, 0.5);
.tax-button {
width: 268rpx;
height: 64rpx;
background: #007aff;
border-radius: 4rpx;
.text {
font-size: 28rpx;
color: #ffffff;
letter-spacing: 0;
font-weight: 400;
}
}
}
</style>

37
pages/mall/index.vue

@ -1,5 +1,5 @@
<template>
<view style="position: relative">
<view class="page">
<view v-if="hasCompany && hasLogin" class="wrapper">
<uni-nav-bar :fixed="true" color="#ffffff" background-color="#ffffff" :status-bar="true">
<view slot="left" class="left-title">纸商城</view>
@ -60,11 +60,8 @@
</view>
</scroll-list>
</view>
<view>
<view class="offer-prices" @click="nativeTo()"><image class="my-image" src="../../static/imgs/trade/camera.png"></image></view>
</view>
</view>
<view v-show="!hasCompany || !hasLogin">
<view v-else>
<uni-nav-bar :fixed="true" :status-bar="true">
<view slot="left" style="font-size: 40rpx; color: #000000">纸商城</view>
</uni-nav-bar>
@ -93,6 +90,7 @@
</view>
</view>
</view>
<view class="offer-prices" @click="nativeTo()"><image class="my-image" src="../../static/imgs/trade/camera.png"></image></view>
</view>
</template>
@ -325,7 +323,7 @@ export default {
summary: '点击进入我的商城\n限时特价等你来抢!',
scene: scene, // WXSceneTimeline,WXSceneSession
imageUrl: 'https://qncloud.oss-cn-shenzhen.aliyuncs.com/paper_shopkeeper/wx-share-store.png',
href: H5_URL_STORE + `id=${this.$store.state.supplierInfo.supplierId}`,
href: H5_URL_STORE + `id=${this.$store.state.supplierInfo.supplierId}&userId=${this.$store.state.userInfo.userId}`,
success: () => {
console.log('分享成功')
},
@ -342,6 +340,11 @@ export default {
</script>
<style lang="scss" scoped>
.page {
position: relative;
width: 750rpx;
height: 100vh;
}
.wrapper {
width: 750rpx;
overflow: hidden;
@ -498,17 +501,17 @@ export default {
margin-left: 6rpx;
}
}
.offer-prices {
position: absolute;
z-index: 100;
right: 32rpx;
bottom: 122rpx;
border-radius: 50%;
width: 100rpx;
height: 100rpx;
overflow: hidden;
box-shadow: 0rpx 4rpx 34rpx 0rpx rgba(0, 0, 0, 0.2);
}
}
.offer-prices {
position: fixed;
z-index: 100;
right: 32rpx;
bottom: 122rpx;
border-radius: 50%;
width: 100rpx;
height: 100rpx;
overflow: hidden;
box-shadow: 0rpx 4rpx 34rpx 0rpx rgba(0, 0, 0, 0.2);
.my-image {
width: 100rpx;
height: 100rpx;

2
pages/order-detail/index.vue

@ -423,7 +423,7 @@ export default {
}).then((result) => {
if (result) {
// #ifdef APP-PLUS
go2('page-view', { title: '供应商订单签约', url: encodeURIComponent(res.signUrl), params: this.params })
go2('page-view', { title: '供应商订单签约', url: encodeURIComponent(result.signUrl) })
// #endif
// #ifdef H5
if (window) {

2
pages/paper-detail/index.vue

@ -194,7 +194,7 @@ export default {
summary: '纸厂: ' + this.shareInfo.storeName,
scene: scene, // WXSceneTimeline,WXSceneSession
imageUrl: 'https://qncloud.oss-cn-shenzhen.aliyuncs.com/paper_shopkeeper/wx-share-paper.png',
href: H5_URL_PAPER + `id=${this.$store.state.supplierInfo.supplierId}&paperId=${this.id}`,
href: H5_URL_PAPER + `id=${this.$store.state.supplierInfo.supplierId}&paperId=${this.id}&userId=${this.$store.state.userInfo.userId}`,
success: () => {
console.log('分享成功')
},

Loading…
Cancel
Save