|
@@ -173,16 +173,6 @@
|
|
|
<image class="tag-icon" :src="iconSrc('stock-more-features')" mode="aspectFit" />
|
|
<image class="tag-icon" :src="iconSrc('stock-more-features')" mode="aspectFit" />
|
|
|
<text>更多功能</text>
|
|
<text>更多功能</text>
|
|
|
</view>
|
|
</view>
|
|
|
-
|
|
|
|
|
- <!-- 买花记录提示 -->
|
|
|
|
|
- <view class="inline-bought-tooltip-box" v-if="showBoughtTooltip && index === 0"
|
|
|
|
|
- @click.stop="closeBoughtTooltip">
|
|
|
|
|
- <view class="bought-tooltip-content">
|
|
|
|
|
- 重要!购买记录请在这里查看,不在底部的订单里
|
|
|
|
|
- <text class="close-tooltip-icon">×</text>
|
|
|
|
|
- </view>
|
|
|
|
|
- <view class="bought-tooltip-arrow"></view>
|
|
|
|
|
- </view>
|
|
|
|
|
</view>
|
|
</view>
|
|
|
<view class="box_6 flex-row" @click="settleAccounts(ghsInfo)" v-if="Number(ghsInfo.debtAmount) > 0">
|
|
<view class="box_6 flex-row" @click="settleAccounts(ghsInfo)" v-if="Number(ghsInfo.debtAmount) > 0">
|
|
|
<view class="show_clear_area flex-row justify-between">
|
|
<view class="show_clear_area flex-row justify-between">
|
|
@@ -334,7 +324,6 @@ export default {
|
|
|
currentGhs: {},
|
|
currentGhs: {},
|
|
|
displayGhsList: [],// 用于显示在弹框中的供货商列表
|
|
displayGhsList: [],// 用于显示在弹框中的供货商列表
|
|
|
shopInfo: [],
|
|
shopInfo: [],
|
|
|
- showBoughtTooltip: false, // 是否显示买花记录提示
|
|
|
|
|
supplierSearchTime: 0, // 查找附近批发店时间
|
|
supplierSearchTime: 0, // 查找附近批发店时间
|
|
|
hasRequestApi: 0,
|
|
hasRequestApi: 0,
|
|
|
statusBarHeight: 0
|
|
statusBarHeight: 0
|
|
@@ -381,9 +370,6 @@ export default {
|
|
|
})
|
|
})
|
|
|
},
|
|
},
|
|
|
onShow() {
|
|
onShow() {
|
|
|
- const isClosed = uni.getStorageSync('boughtTooltipClosed');
|
|
|
|
|
- this.showBoughtTooltip = (isClosed !== true && isClosed !== 'true' && isClosed !== '1');
|
|
|
|
|
-
|
|
|
|
|
this.supplierSearchTime = uni.getStorageSync('supplier_search_time') || 0;
|
|
this.supplierSearchTime = uni.getStorageSync('supplier_search_time') || 0;
|
|
|
|
|
|
|
|
this.init();
|
|
this.init();
|
|
@@ -416,10 +402,6 @@ export default {
|
|
|
},
|
|
},
|
|
|
methods: {
|
|
methods: {
|
|
|
iconSrc,
|
|
iconSrc,
|
|
|
- closeBoughtTooltip() {
|
|
|
|
|
- this.showBoughtTooltip = false;
|
|
|
|
|
- uni.setStorageSync('boughtTooltipClosed', '1');
|
|
|
|
|
- },
|
|
|
|
|
onChooseAvatar(e) {
|
|
onChooseAvatar(e) {
|
|
|
if (this.loginInfo && this.loginInfo.staff && this.loginInfo.staff.founder != 2) {
|
|
if (this.loginInfo && this.loginInfo.staff && this.loginInfo.staff.founder != 2) {
|
|
|
this.$msg('门店LOGO请老板修改')
|
|
this.$msg('门店LOGO请老板修改')
|
|
@@ -1524,52 +1506,6 @@ export default {
|
|
|
line-height: 1.4;
|
|
line-height: 1.4;
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
-.inline-bought-tooltip-box {
|
|
|
|
|
- position: absolute;
|
|
|
|
|
- top: 86upx;
|
|
|
|
|
- left: 50%;
|
|
|
|
|
- transform: translateX(-50%);
|
|
|
|
|
- z-index: 10000;
|
|
|
|
|
- display: flex;
|
|
|
|
|
- flex-direction: column;
|
|
|
|
|
- align-items: center;
|
|
|
|
|
- width: 565upx;
|
|
|
|
|
-}
|
|
|
|
|
-
|
|
|
|
|
-.bought-tooltip-content {
|
|
|
|
|
- background-color: #333333;
|
|
|
|
|
- color: #fff;
|
|
|
|
|
- padding: 16upx 20upx;
|
|
|
|
|
- border-radius: 12upx;
|
|
|
|
|
- font-size: 38upx;
|
|
|
|
|
- display: flex;
|
|
|
|
|
- align-items: flex-start;
|
|
|
|
|
- white-space: normal;
|
|
|
|
|
- text-align: left;
|
|
|
|
|
- line-height: 1.5;
|
|
|
|
|
- word-break: break-all;
|
|
|
|
|
-}
|
|
|
|
|
-
|
|
|
|
|
-.close-tooltip-icon {
|
|
|
|
|
- margin-left: 10upx;
|
|
|
|
|
- font-size: 46upx;
|
|
|
|
|
- color: #ccc;
|
|
|
|
|
- padding: 0 4upx;
|
|
|
|
|
- line-height: 1;
|
|
|
|
|
- flex-shrink: 0;
|
|
|
|
|
- margin-top: 4upx;
|
|
|
|
|
-}
|
|
|
|
|
-
|
|
|
|
|
-.bought-tooltip-arrow {
|
|
|
|
|
- width: 0;
|
|
|
|
|
- height: 0;
|
|
|
|
|
- border-left: 30upx solid transparent;
|
|
|
|
|
- border-right: 30upx solid transparent;
|
|
|
|
|
- border-bottom: 30upx solid #333333;
|
|
|
|
|
- margin-bottom: -15upx;
|
|
|
|
|
- order: -1;
|
|
|
|
|
-}
|
|
|
|
|
-
|
|
|
|
|
/* New workbench visual style */
|
|
/* New workbench visual style */
|
|
|
.order-page {
|
|
.order-page {
|
|
|
min-height: 100vh;
|
|
min-height: 100vh;
|
|
@@ -2044,14 +1980,6 @@ export default {
|
|
|
box-shadow: 0 10upx 28upx rgba(24, 37, 30, 0.06);
|
|
box-shadow: 0 10upx 28upx rgba(24, 37, 30, 0.06);
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
-.inline-bought-tooltip-box {
|
|
|
|
|
- top: 152upx;
|
|
|
|
|
-}
|
|
|
|
|
-
|
|
|
|
|
-.bought-tooltip-content {
|
|
|
|
|
- font-size: 30upx;
|
|
|
|
|
-}
|
|
|
|
|
-
|
|
|
|
|
.function-icon,
|
|
.function-icon,
|
|
|
.phone-icon,
|
|
.phone-icon,
|
|
|
.tag-icon,
|
|
.tag-icon,
|