Browse Source

和线上代码同步,本版本不同步给左都辉

master
liutong 1 year ago
parent
commit
ab9144f1ec
  1. BIN
      ci/shenbeitang(2).mobileprovision
  2. BIN
      ci/shenbeitang(2).p12
  3. 5
      common/js/diy.js
  4. 24
      components/directionGoodsItem.vue
  5. 40
      components/payment/payment.vue
  6. 30
      config/componentConfig.js
  7. 6
      config/production.js
  8. 6
      manifest.json
  9. 6
      page_goods/components/common-payment/common-payment.vue
  10. 7
      page_goods/components/common-payment/payment.js
  11. 42
      page_goods/detail/detail.vue
  12. 16
      page_goods/orderDetail/orderDetail.vue
  13. 3
      page_goods/orderDetail/public/js/orderMethod.js
  14. 3
      page_goods/public/js/orderMethod.js
  15. 104
      page_salesman_index/Tobe_shipped/Tobe_shipped.vue
  16. 26
      page_salesman_index/index/beconfirmed.vue
  17. 24
      page_salesman_index/index/bereceived.vue
  18. 24
      page_salesman_index/index/close.vue
  19. 34
      page_salesman_index/index/index.vue
  20. 24
      page_salesman_index/index/received.vue
  21. 27
      page_salesman_index/index/reviewed.vue
  22. 26
      page_salesman_index/index/shipped.vue
  23. 6
      page_salesman_order/Goods_received/Goods_received.vue
  24. 88
      page_salesman_order/Goods_received/Goods_received_COPY原版备份.vue
  25. 122
      page_salesman_order/Order_details/Order_details.vue
  26. 52
      page_salesman_order/index/index.vue
  27. 27
      page_salesman_order/undgbm/undgbm.vue
  28. 8
      pages.json
  29. 20
      pages/index/index.vue
  30. 10
      pages/init.vue
  31. 54
      pages/order/list.vue
  32. 33
      pages_tool/invoice/invoice.vue
  33. 8
      pages_tool/order/refund_goods_select.vue
  34. 24
      pages_tool/order/refund_type_select.vue
  35. 2
      pages_tool/order/sales_return.vue

BIN
ci/shenbeitang(2).mobileprovision

Binary file not shown.

BIN
ci/shenbeitang(2).p12

Binary file not shown.

5
common/js/diy.js

@ -264,8 +264,6 @@ export default {
is_default: this.isDefault
},
success: res => {
// console.log(JSON.parse(res.data.value));
// console.log(JSON.parse(res.data.value),`diy`);
if (res.code != 0 || !res.data) {
if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
this.diyData = {};
@ -279,7 +277,6 @@ export default {
if (diyDatavalue.value) {
// uni.setStorageSync(this.name, diyDatavalue.value);
this.diyData = JSON.parse(diyDatavalue.value);
console.log(this.diyData);
this.diyData.compExtend = diyDatavalue.comp_extend; // 自定义扩展组件
this.$langConfig.title(this.diyData.global.title);
this.mpCollect = this.diyData.global.mpCollect;
@ -392,7 +389,7 @@ export default {
this.getDiyInfo();
this.$refs.diyGroup.$refs.ManyGoodsList[0].$refs.diyGoodsList.getGoodsList();
})
this.$refs.uniPopupWindow.open();
// this.$refs.uniPopupWindow.open();
}
},
onReachBottom() {

24
components/directionGoodsItem.vue

@ -167,9 +167,9 @@
</template>
<script>
import nsGoodsSku from '@/components/ns-goods-sku/ns-goods-sku.vue';
import { mapGetters } from 'vuex';
export default {
import nsGoodsSku from '@/components/ns-goods-sku/ns-goods-sku.vue';
import { mapGetters } from 'vuex';
export default {
components: { nsGoodsSku },
name: 'directionGoodsItem',
props: {
@ -727,15 +727,15 @@
});
}
}
};
};
</script>
<style lang="scss" scoped>
.box {
.box {
margin-bottom: 20rpx;
}
}
.head {
.head {
width: 750rpx;
height: 740rpx;
background: #ffffff;
@ -829,9 +829,9 @@
bottom: 24rpx;
color: #fff;
}
}
}
.directionItem {
.directionItem {
width: 48%;
/* #ifdef MP-WEIXIN */
width: 100%;
@ -966,9 +966,9 @@
}
}
}
}
}
.sku-layer {
.sku-layer {
.sku-info {
max-height: 75vh;
@ -1187,5 +1187,5 @@
font-weight: bold;
}
}
}
}
</style>

40
components/payment/payment.vue

@ -48,16 +48,16 @@
<!-- 新版支付组件 订单表为order表 的订单支付时使用该组件 -->
<script>
import uniPopup from '@/components/uni-popup/uni-popup.vue';
import nsSwitch from '@/components/ns-switch/ns-switch.vue';
import uniPopup from '@/components/uni-popup/uni-popup.vue';
import nsSwitch from '@/components/ns-switch/ns-switch.vue';
// #ifdef H5
import { Weixin } from 'common/js/wx-jssdk.js';
// #ifdef H5
import { Weixin } from 'common/js/wx-jssdk.js';
import { launchMiniProgram } from '../../common/js/jweixin-module/out';
// #endif
// #endif
// uniapi
const MiniWarp = (fn, data) => {
// uniapi
const MiniWarp = (fn, data) => {
return new Promise((resolve, reject) => {
fn({
success: (res) => resolve(res),
@ -65,12 +65,12 @@ import { launchMiniProgram } from '../../common/js/jweixin-module/out';
...data,
})
})
}
const uniLogin = data => MiniWarp(uni.login, data);
const requestPayment = data => MiniWarp(uni.requestPayment, data);
// let sweixin = null;
// sweixin = plus.share.getServices()
export default {
}
const uniLogin = data => MiniWarp(uni.login, data);
const requestPayment = data => MiniWarp(uni.requestPayment, data);
// let sweixin = null;
// sweixin = plus.share.getServices()
export default {
name: 'payment',
components: {
uniPopup,
@ -659,11 +659,11 @@ import { launchMiniProgram } from '../../common/js/jweixin-module/out';
clearInterval(this.timer);
}
// #endif
};
};
</script>
<style lang="scss" scoped>
.popup {
.popup {
width: 75vw;
background: #fff;
border-top-left-radius: $border-radius;
@ -718,9 +718,9 @@ import { launchMiniProgram } from '../../common/js/jweixin-module/out';
padding-bottom: env(safe-area-inset-bottom);
}
}
}
}
.choose-payment-popup {
.choose-payment-popup {
.payment-item {
display: flex;
align-items: center;
@ -822,13 +822,13 @@ import { launchMiniProgram } from '../../common/js/jweixin-module/out';
font-size: $font-size-toolbar;
}
}
}
}
.empty {
.empty {
width: 100%;
text-align: center;
padding: 40rpx 0;
color: $color-sub;
font-size: $font-size-tag;
}
}
</style>

30
config/componentConfig.js

@ -36,12 +36,18 @@ export default {
teamId = updateConfig.teamId
baseURL = updateConfig.ipConfig
}
console.log(`${baseURL}/api/app/checkupdate/${teamId}/${platform}/${bundleID}/${version.versionCode}`,
'################################');
const res = await requestGet(
`${baseURL}/api/app/checkupdate/${teamId}/${platform}/${bundleID}/${version.versionCode}`).then(
res => res.data)
console.log(res);
// console.log(111, `${baseURL}/api/app/checkupdate/${teamId}/${platform}/${bundleID}/${version.versionCode}`,
// '################################');
// const res = await requestGet(
// `${baseURL}/api/app/checkupdate/${teamId}/${platform}/${bundleID}/${version.versionCode}`).then(
// res => res.data)
const res = await requestGet(`https://cbtadmin.jtyqt.com/api/config/checkupdate`).then(
res => {
console.log('====>', res);
return res.data
})
const returnRes = {
versionCode: '', // int 版本号
versionName: '', // String 版本名称
@ -49,11 +55,10 @@ export default {
updateType: '', // String forcibly = 强制更新, solicit = 弹窗确认更新, silent = 静默更新
downloadUrl: '' // String 版本下载链接(IOS安装包更新请放跳转store应用商店链接,安卓apk和wgt文件放文件下载链接)
};
if (!res || !res.success) {
if (Number(res.data.versionCode) <= version.versionCode) {
// 不提示
if (!isPrompt) return
if(isCustom) {
if (isCustom) {
return;
}
// 提示
@ -70,17 +75,16 @@ export default {
normal: 'solicit',
silent: 'silent'
}
const versionData = res.data.version
// const versionData = res.data.version
const versionData = res.data
// versionData.updateMode = 'force'
returnRes.versionCode = Number(versionData.versionCode)
returnRes.versionName = versionData.versionStr
returnRes.versionInfo = versionData.changelog || ''
returnRes.updateType = updateMode2Type[versionData.updateMode] ? updateMode2Type[versionData
.updateMode] : 'solicit'
returnRes.downloadUrl = versionData.installUrl
console.log(returnRes);
console.log(returnRes, 'returnRes');
// 兼容之前的版本
return callback && callback(returnRes);

6
config/production.js

@ -4,13 +4,11 @@
// api请求地址
// export const baseUrl = 'https://cbtadmin.jtyqt.com'
// export const baseUrl = 'https://yaochangtest.first.xinzhidi.cn'//测试地址1
export const baseUrl = 'http://devzhiyao.zeyan.wang'//测试地址2
export const baseUrl = 'https://cbtadmin.jtyqt.com'
// 图片域名
// export const imgDomain='https://cbtadmin.jtyqt.com'
// export const imgDomain = 'https://yaochangtest.first.xinzhidi.cn'//测试地址1
export const imgDomain = 'http://devzhiyao.zeyan.wang'//测试地址2
export const imgDomain = 'https://cbtadmin.jtyqt.com'
// 极光推送
export const PUSHCONFIG = {

6
manifest.json

@ -1,9 +1,9 @@
{
"name" : "齐采药",
"appid" : "__UNI__9C80A8A",
"appid" : "__UNI__9009737",
"description" : "",
"versionName" : "1.000.188",
"versionCode" : 10001234,
"versionName" : "1.000.1243",
"versionCode" : 10001243,
"transformPx" : false,
"app-plus" : {
"compatible" : {

6
page_goods/components/common-payment/common-payment.vue

@ -412,7 +412,7 @@
<u-switch v-model="is_invoice" :activeValue="1" activeColor="var(--base-color)"
:inactiveValue="0" @change="change"></u-switch>
</view>
<!-- <view class="site-wrap buy-one-bytheway">
<view class="site-wrap buy-one-bytheway" v-if="buyOneGoodsData">
<view class="headerline">
<view class="title">顺手买一件</view>
<view @click="handleChangeBuyOne" class="change">
@ -422,7 +422,7 @@
</view>
<view class="goodsContent">
<view class="image">
<img :src="buyOneGoodsData.goods_image.split(',')[0]" mode="aspectFill" />
<img :src="buyOneGoodsData && buyOneGoodsData.goods_image.split(',')[0]" mode="aspectFill" />
</view>
<view class="right">
<view class="contnent">
@ -441,7 +441,7 @@
</view>
</view>
</view>
</view> -->
</view>
<!-- <view v-if="false" class="site-wrap buyer-message df aic jcsb" @click="btn">
<div class="tit">发票</div>
<image class="imgar" :src="$util.img('/upload/weapp/user/arrow-right.png')" mode=""></image>

7
page_goods/components/common-payment/payment.js

@ -193,6 +193,13 @@ export default {
}
},
handleChangeBuyOne() {
if(this.buyOnetotal === 1) {
uni.showToast({
title: '没有更多了~',
icon: 'none'
})
return;
}
this.buyOnePageNum += 1;
this.getBuyOneInfo();
this.isCheckedBuyOne = []

42
page_goods/detail/detail.vue

@ -669,7 +669,7 @@
class="goods-action-button" :backgroundColor="themeStyle.bg_color"
:textColor="themeStyle.btn_text_color" text="立即购买" @click="buyNow" />
</block>
<!-- </template>
<!-- </template>
<template v-else>
<ns-goods-action-button class="goods-action-button active3" disabled-text="该商品已下架"
:disabled="true" />
@ -684,21 +684,21 @@
</template>
<script>
import { mapGetters } from 'vuex';
import nsGoodsAction from '@/components/ns-goods-action/ns-goods-action.vue';
import nsGoodsActionIcon from '@/components/ns-goods-action-icon/ns-goods-action-icon.vue';
import nsGoodsActionButton from '@/components/ns-goods-action-button/ns-goods-action-button.vue';
import uniPopup from '@/components/uni-popup/uni-popup.vue';
import nsGoodsSku from '@/components/ns-goods-sku/ns-goods-sku.vue';
import uniCountDown from '@/components/uni-count-down/uni-count-down.vue';
import detail from './public/js/detail.js';
import scroll from '@/common/js/scroll-view.js';
import toTop from '@/components/toTop/toTop.vue';
import goodsDetailBase from '@/common/js/goods_detail_base.js';
import goodsDetailView from '../components/goods-detail-view/goods-detail-view.vue';
import goodsPrice from '@/components/goodsPrice.vue';
export default {
import { mapGetters } from 'vuex';
import nsGoodsAction from '@/components/ns-goods-action/ns-goods-action.vue';
import nsGoodsActionIcon from '@/components/ns-goods-action-icon/ns-goods-action-icon.vue';
import nsGoodsActionButton from '@/components/ns-goods-action-button/ns-goods-action-button.vue';
import uniPopup from '@/components/uni-popup/uni-popup.vue';
import nsGoodsSku from '@/components/ns-goods-sku/ns-goods-sku.vue';
import uniCountDown from '@/components/uni-count-down/uni-count-down.vue';
import detail from './public/js/detail.js';
import scroll from '@/common/js/scroll-view.js';
import toTop from '@/components/toTop/toTop.vue';
import goodsDetailBase from '@/common/js/goods_detail_base.js';
import goodsDetailView from '../components/goods-detail-view/goods-detail-view.vue';
import goodsPrice from '@/components/goodsPrice.vue';
export default {
components: {
nsGoodsAction,
nsGoodsActionIcon,
@ -772,14 +772,14 @@
// });
}
}
};
};
</script>
<style lang="scss">
@import '@/common/css/goods_detail.scss';
@import './public/css/detail.scss';
@import '@/common/css/goods_detail.scss';
@import './public/css/detail.scss';
</style>
<style lang="scss" scoped>
.goods_detail {
.goods_detail {
/deep/ .action-icon-wrap .iconfont.icon-shouye1 {
@ -1131,5 +1131,5 @@
margin-right: 40rpx;
}
}
}
}
</style>

16
page_goods/orderDetail/orderDetail.vue

@ -566,8 +566,8 @@
<text class="color-base-text price-font">
<text class="font-size-goods-tag">{{ $lang('common.currencySymbol') }}</text>
<text class="font-size-base">{{ payInfo.total_money }}</text>
<!-- <text class="font-size-base" v-if="!Number(orderData.sales_money)">{{ orderData.order_money }}</text>-->
<!-- <text class="font-size-base" v-else-if="Number(orderData.sales_money)">{{ orderData.sales_money }}</text>-->
<!-- <text class="font-size-base" v-if="!Number(orderData.sales_money)">{{ orderData.order_money }}</text>-->
<!-- <text class="font-size-base" v-else-if="Number(orderData.sales_money)">{{ orderData.sales_money }}</text>-->
</text>
</view>
</view>
@ -624,11 +624,11 @@
</template>
<script>
import nsGoodsRecommend from '@/components/ns-goods-recommend/ns-goods-recommend.vue';
import orderMethod from './public/js/orderMethod.js';
import nsPayment from '@/components/payment/payment.vue';
import nsGoodsRecommend from '@/components/ns-goods-recommend/ns-goods-recommend.vue';
import orderMethod from './public/js/orderMethod.js';
import nsPayment from '@/components/payment/payment.vue';
export default {
export default {
data() {
return {
isIphoneX: false,
@ -893,9 +893,9 @@
return Math.abs(parseFloat(value)).toFixed(2);
}
}
};
};
</script>
<style lang="scss">
@import './public/css/detail.scss';
@import './public/css/detail.scss';
</style>

3
page_goods/orderDetail/public/js/orderMethod.js

@ -10,8 +10,7 @@ export default {
} else {
uni.showModal({
title: '提示',
// content: '商家已将支付金额调整为' + orderData.pay_money + '元,是否继续支付?',
content: `商家已将支付金额调整为${orderData.pay_money}元,还需支付${orderData.pay.pay_money}元,是否继续支付?`,
content: '商家已将支付金额调整为' + orderData.pay_money + '元,是否继续支付?',
success: res => {
if (res.confirm) {
this.pay();

3
page_goods/public/js/orderMethod.js

@ -10,7 +10,8 @@ export default {
} else {
uni.showModal({
title: '提示',
content: '商家已将支付金额调整为' + orderData.pay_money + '元,是否继续支付?',
// content: '商家已将支付金额调整为' + orderData.pay_money + '元,是否继续支付?',
content: `商家已将支付金额调整为${orderData.pay_money}元,还需支付${orderData.pay.pay_money}元,是否继续支付?`,
success: res => {
if (res.confirm) {
this.pay();

104
page_salesman_index/Tobe_shipped/Tobe_shipped.vue

@ -95,20 +95,20 @@
</div>
</view>
<view class="Collection-record">
<!-- <div class="df jcsb " @click="Logistics">-->
<!-- <div>发货/物流记录</div>-->
<!-- <div class="df">-->
<!-- <u-icon name="arrow-right"></u-icon>-->
<!-- </div>-->
<!-- </div>-->
<!-- <div class="df jcsb " @click="Logistics">-->
<!-- <div>发货/物流记录</div>-->
<!-- <div class="df">-->
<!-- <u-icon name="arrow-right"></u-icon>-->
<!-- </div>-->
<!-- </div>-->
<!-- <div class="dotted-line" style="margin: 24rpx 0;"></div> -->
<div class="df jcsb" @click="Collection">
<div>收款记录</div>
<div class="df">
<!-- <div v-if="data.wait_status==1 && data.sales_balance==1 &&data.wait_status==1">待确认</div>-->
<!-- <div v-else-if="data.wait_status==1 && data.sales_balance==1 &&data.wait_status==2">已确认</div>-->
<!-- <div v-else-if="data.sales_balance==0">已支付</div>-->
<!-- <div v-else>暂无收款记录</div>-->
<!-- <div v-if="data.wait_status==1 && data.sales_balance==1 &&data.wait_status==1">待确认</div>-->
<!-- <div v-else-if="data.wait_status==1 && data.sales_balance==1 &&data.wait_status==2">已确认</div>-->
<!-- <div v-else-if="data.sales_balance==0">已支付</div>-->
<!-- <div v-else>暂无收款记录</div>-->
<div v-if="!(data.pay || false)">暂无收款记录{{data.pay.pay_status}}</div>
<div v-else-if="data.pay.pay_status == 2">已支付</div>
@ -285,12 +285,12 @@
</template>
<script>
import {
import {
computed
} from "vue"
const timesfm = require('@/common/js/map/message.js')
import eventBus from '@/common/js/bus.js'
export default {
} from "vue"
const timesfm = require('@/common/js/map/message.js')
import eventBus from '@/common/js/bus.js'
export default {
data() {
return {
show: false,
@ -731,11 +731,11 @@
}
}
}
}
</script>
<style lang="scss">
.listacd {
.listacd {
width: 100%;
height: 100%;
background-color: rgb(247, 247, 247);
@ -782,18 +782,18 @@
border-radius: 20rpx;
color: #fff;
}
}
}
.list-list {
.list-list {
/* #ifdef APP */
margin-top: 20rpx;
/* #endif */
/* #ifdef H5 */
margin-top: 100rpx;
/* #endif */
}
}
.list {
.list {
width: 702rpx;
// height: 324rpx;
background: #FFFFFF;
@ -897,9 +897,9 @@
}
}
}
}
}
.Special-rating {
.Special-rating {
width: 630rpx;
background: #FFFFFF;
border-radius: 24px;
@ -910,13 +910,13 @@
box-sizing: border-box;
padding-bottom: 32rpx;
}
}
.empty-fixed {
.empty-fixed {
margin-top: 0 !important;
}
}
.Special-rating div:nth-child(1) {
.Special-rating div:nth-child(1) {
margin-top: 40rpx;
text-align: center;
font-size: 32rpx;
@ -924,9 +924,9 @@
font-weight: 500;
color: #222222;
line-height: 44rpx;
}
}
.Special-rating div:nth-child(2) {
.Special-rating div:nth-child(2) {
font-size: 28rpx;
font-family: PingFangSC-Regular, PingFang SC;
font-weight: 400;
@ -934,9 +934,9 @@
line-height: 40rpx;
margin-top: 30rpx;
margin-left: 28rpx;
}
}
.Special-rating div:nth-child(3) {
.Special-rating div:nth-child(3) {
margin-top: 24rpx;
height: 70rpx;
@ -983,9 +983,9 @@
right: 24rpx;
}
}
}
}
.Special-rating div:nth-child(4) {
.Special-rating div:nth-child(4) {
height: 160rpx;
margin-top: 24rpx;
@ -1009,9 +1009,9 @@
margin-top: 0;
}
}
}
.Special-rating div:nth-child(5) {
.Special-rating div:nth-child(5) {
width: 570rpx;
height: 68rpx;
font-size: 24rpx;
@ -1021,9 +1021,9 @@
line-height: 34rpx;
margin: 0 auto;
margin-top: 16rpx;
}
}
.Special-rating div:nth-child(6) {
.Special-rating div:nth-child(6) {
margin-top: 44rpx;
div:nth-child(1) {
@ -1053,9 +1053,9 @@
line-height: 40rpx;
}
}
}
.transportation {
.transportation {
width: 540rpx;
height: 448rpx;
background: #FFFFFF;
@ -1098,9 +1098,9 @@
margin-left: 32rpx;
padding: 0;
}
}
}
.transportation div:nth-child(1) {
.transportation div:nth-child(1) {
font-size: 32rpx;
font-family: PingFangSC-Medium, PingFang SC;
font-weight: 500;
@ -1108,9 +1108,9 @@
line-height: 44rpx;
text-align: center;
margin-top: 40rpx;
}
}
.transportation div:nth-child(2) {
.transportation div:nth-child(2) {
font-size: 28rpx;
font-family: PingFangSC-Regular, PingFang SC;
font-weight: 400;
@ -1122,9 +1122,9 @@
text:nth-child(2) {
margin-left: 16rpx;
}
}
}
.transportation div:nth-child(3) {
.transportation div:nth-child(3) {
div:nth-child(1) {
width: 112rpx;
height: 40rpx;
@ -1163,18 +1163,18 @@
line-height: 40rpx;
}
}
}
}
.fill-in {
.fill-in {
font-size: 24rpx;
font-family: PingFangSC-Regular, PingFang SC;
font-weight: 400;
color: #585858;
line-height: 34rpx;
margin: 20rpx 0 0 36rpx;
}
}
.nav {
.nav {
width: 750rpx;
height: 100rpx;
background: #F7F7F7;
@ -1205,9 +1205,9 @@
border-radius: 40rpx;
margin: 0 0rpx 0 20rpx;
}
}
}
.Order-details {
.Order-details {
padding: 24rpx;
.Order-status {
@ -1639,5 +1639,5 @@
padding: 0 50rpx 0 46rpx;
}
}
}
}
</style>

26
page_salesman_index/index/beconfirmed.vue

@ -57,9 +57,9 @@
</template>
<script>
const timesfm = require('@/common/js/map/message.js')
import eventBus from '@/common/js/bus.js'
export default {
const timesfm = require('@/common/js/map/message.js')
import eventBus from '@/common/js/bus.js'
export default {
data() {
return {
list: [],
@ -237,23 +237,23 @@
}
}
}
}
</script>
<style lang="scss">
.box .list:nth-child(1) {
.box .list:nth-child(1) {
margin: 34rpx 24rpx 0 24rpx !important;
// margin: 0 !important;
}
}
.box {
.box {
margin-top: -28rpx !important;
}
}
.list {
.list {
margin: 42rpx 24rpx 0 24rpx;
width: 702rpx;
//height: 424rpx;
height: 480rpx;
background: #FFFFFF;
border-radius: 24rpx;
// padding: 32rpx;
@ -445,9 +445,9 @@
}
}
}
.list-mt {
.list-mt {
margin-top: 28rpx;
}
}
</style>

24
page_salesman_index/index/bereceived.vue

@ -53,9 +53,9 @@
</template>
<script>
const timesfm = require('@/common/js/map/message.js')
import eventBus from '@/common/js/bus.js'
export default {
const timesfm = require('@/common/js/map/message.js')
import eventBus from '@/common/js/bus.js'
export default {
data() {
return {
show1: false,
@ -240,20 +240,20 @@
}
}
}
}
</script>
<style lang="scss">
.box {
.box {
margin-top: -28rpx;
}
}
.box .list:nth-child(1) {
.box .list:nth-child(1) {
margin: 34rpx 24rpx 0 24rpx !important;
// margin: 0 !important;
}
}
.list {
.list {
margin: 42rpx 24rpx 0 24rpx;
width: 702rpx;
//height: 424rpx;
@ -447,9 +447,9 @@
}
}
}
.list-mt {
.list-mt {
// margin-top: 28rpx;
}
}
</style>

24
page_salesman_index/index/close.vue

@ -53,9 +53,9 @@
</template>
<script>
const timesfm = require('@/common/js/map/message.js')
import eventBus from '@/common/js/bus.js'
export default {
const timesfm = require('@/common/js/map/message.js')
import eventBus from '@/common/js/bus.js'
export default {
data() {
return {
list: [],
@ -245,20 +245,20 @@
}
}
}
}
</script>
<style lang="scss">
.box .list:nth-child(1) {
.box .list:nth-child(1) {
margin: 34rpx 24rpx 0 24rpx !important;
// margin: 0 !important;
}
}
.box {
.box {
margin-top: -28rpx !important;
}
}
.list {
.list {
margin: 42rpx 24rpx 0 24rpx;
width: 702rpx;
height: 424rpx;
@ -453,9 +453,9 @@
}
}
}
.list-mt {
.list-mt {
margin-top: 28rpx;
}
}
</style>

34
page_salesman_index/index/index.vue

@ -179,12 +179,12 @@
</template>
<script>
import lineChart from "../components/lineChart/lineChart.vue"
import tabbar from "@/components/pageSalesman/tabbar/tabbar.vue"
import userPopup from "./components/userPopup.vue"
import APPUpdate from '@/config/appUpdate.js';
import uniDatetimePicker from "../components/uni-datetime-picker/components/uni-datetime-picker/uni-datetime-picker.vue"
export default {
import lineChart from "../components/lineChart/lineChart.vue"
import tabbar from "@/components/pageSalesman/tabbar/tabbar.vue"
import userPopup from "./components/userPopup.vue"
import APPUpdate from '@/config/appUpdate.js';
import uniDatetimePicker from "../components/uni-datetime-picker/components/uni-datetime-picker/uni-datetime-picker.vue"
export default {
components: {
lineChart,
tabbar,
@ -534,20 +534,20 @@
return num
},
}
}
}
</script>
<style lang="scss" scoped>
.zhanwei {
.zhanwei {
height: 280rpx;
}
}
.booooo {
.booooo {
width: 750rpx;
height: 330rpx;
}
}
::v-deep {
::v-deep {
.zp-paging-container-content {
margin-top: 50rpx;
display: flex;
@ -558,15 +558,15 @@
.zp-l-text {
display: none;
}
}
}
.tumin {
.tumin {
width: 70rpx;
height: 70rpx;
border: 2rpx solid #ccc;
}
}
.index {
.index {
// -margin-top: 200rpx;
min-height: 900rpx;
background: rgb(92, 195, 252);
@ -841,5 +841,5 @@
border-radius: 50%;
}
}
}
}
</style>

24
page_salesman_index/index/received.vue

@ -53,9 +53,9 @@
</template>
<script>
const timesfm = require('@/common/js/map/message.js')
import eventBus from '@/common/js/bus.js'
export default {
const timesfm = require('@/common/js/map/message.js')
import eventBus from '@/common/js/bus.js'
export default {
data() {
return {
list: [],
@ -246,20 +246,20 @@
}
}
}
}
</script>
<style lang="scss">
.box .list:nth-child(1) {
.box .list:nth-child(1) {
margin: 34rpx 24rpx 0 24rpx !important;
// margin: 0 !important;
}
}
.box {
.box {
margin-top: -28rpx !important;
}
}
.list {
.list {
margin: 42rpx 24rpx 0 24rpx;
width: 702rpx;
//height: 424rpx;
@ -454,9 +454,9 @@
}
}
}
.list-mt {
.list-mt {
margin-top: 28rpx;
}
}
</style>

27
page_salesman_index/index/reviewed.vue

@ -11,7 +11,7 @@
</view>
<view class="list-data df jcsb">
<div>订单编号:&emsp;{{item.order_no}}</div>
<!-- <div v-if="item.sales_status==1 &&item.sales_balance==0">待支付</div>-->
<!-- <div v-if="item.sales_status==1 &&item.sales_balance==0">待支付</div>-->
<div v-if="item.sales_status==1 &&item.pay.pay_status==0">待支付</div>
<div v-if="item.sales_status==0">待审核</div>
<!-- <div v-if="item.sales_balance==0 && item.waif_status==1">待支付</div>
@ -67,9 +67,9 @@
</template>
<script>
const timesfm = require('@/common/js/map/message.js')
import eventBus from '@/common/js/bus.js'
export default {
const timesfm = require('@/common/js/map/message.js')
import eventBus from '@/common/js/bus.js'
export default {
data() {
return {
list: [],
@ -329,23 +329,24 @@
}
}
}
}
</script>
<style lang="scss">
.box .list:nth-child(1) {
.box .list:nth-child(1) {
margin: 34rpx 24rpx 0 24rpx !important;
// margin: 0 !important;
}
}
.box {
.box {
margin-top: -28rpx !important;
}
}
.list {
.list {
margin: 42rpx 24rpx 0 24rpx;
width: 702rpx;
//height: 424rpx;
height: 480rpx;
background: #FFFFFF;
border-radius: 24rpx;
// padding: 32rpx;
@ -537,9 +538,9 @@
}
}
}
.list-mt {
.list-mt {
margin-top: 28rpx;
}
}
</style>

26
page_salesman_index/index/shipped.vue

@ -45,7 +45,7 @@
<div class="df aic jcsa listtwo" v-if="item.sales_balance==1 && item.sales_status==1"
@click.stop="affirm(item.order_id,item.member_id)">确认收款</div>
<!--订单处于待审核状态展示取消审核按钮-暂时注释-->
<!-- <div class="df aic jcsa listsui" v-if="item.sales_status != 0" @click.stop="cancelAudit(item.order_id,item.member_id)">取消审核</div>-->
<!-- <div class="df aic jcsa listsui" v-if="item.sales_status != 0" @click.stop="cancelAudit(item.order_id,item.member_id)">取消审核</div>-->
<div class="df aic jcsa listsui" @click.stop="more(item)">再次订购</div>
</view>
</view>
@ -55,9 +55,9 @@
</template>
<script>
const timesfm = require('@/common/js/map/message.js')
import eventBus from '@/common/js/bus.js'
export default {
const timesfm = require('@/common/js/map/message.js')
import eventBus from '@/common/js/bus.js'
export default {
data() {
return {
list: [],
@ -282,20 +282,20 @@
}
}
}
}
</script>
<style lang="scss">
.box .list:nth-child(1) {
.box .list:nth-child(1) {
margin: 34rpx 24rpx 0 24rpx !important;
// margin: 0 !important;
}
}
.box {
.box {
margin-top: -28rpx !important;
}
}
.list {
.list {
margin: 42rpx 24rpx 0 24rpx;
width: 702rpx;
//height: 424rpx;
@ -490,9 +490,9 @@
}
}
}
.list-mt {
.list-mt {
margin-top: 28rpx;
}
}
</style>

6
page_salesman_order/Goods_received/Goods_received.vue

@ -251,10 +251,10 @@
@click="ConfirmCharge">确认收货</div>
<div class="df aic jcsa listtwo" v-if="data.order_status_name=='待支付'" @click="payment">去支付</div>
<div class="df aic jcsa listtwo" v-if="data.order_status==1" @click="show3=true">确认发货</div>
<!-- 暂时注释审核功能-->
<!-- <div class="df aic jcsa listtwo" v-if="data.sales_status == 0" @click="show9=true">去审核</div>-->
<!-- 暂时注释审核功能-->
<!-- <div class="df aic jcsa listtwo" v-if="data.sales_status == 0" @click="show9=true">去审核</div>-->
<!--订单状态order_status在[0待支付,1待发货,20待审核] && sales_status=0时才展示取消审核-->
<!-- <div class="df aic jcsa listtwo" v-if="data.sales_status != 0 && [0,1,20].includes(data.order_status)" @click="cancelAudit(data.order_id)">取消审核</div>-->
<!-- <div class="df aic jcsa listtwo" v-if="data.sales_status != 0 && [0,1,20].includes(data.order_status)" @click="cancelAudit(data.order_id)">取消审核</div>-->
</view>
<u-overlay :show="show9">
<view class="head-one">

88
page_salesman_order/Goods_received/Goods_received_COPY原版备份.vue

@ -99,9 +99,9 @@
<div class="df jcsb" @click="Collection">
<div>收款记录</div>
<div class="df">
<!-- <div v-if="data.wait_status==1 && data.sales_balance==1 &&data.wait_status==1">待确认</div>-->
<!-- <div v-else-if="data.wait_status==1 && data.sales_balance==1 &&data.wait_status==2">已确认</div>-->
<!-- <div v-else-if="data.sales_balance==0">已支付</div>-->
<!-- <div v-if="data.wait_status==1 && data.sales_balance==1 &&data.wait_status==1">待确认</div>-->
<!-- <div v-else-if="data.wait_status==1 && data.sales_balance==1 &&data.wait_status==2">已确认</div>-->
<!-- <div v-else-if="data.sales_balance==0">已支付</div>-->
<div v-if="data.pay.pay_status == 1 ">支付中</div>
<div v-else-if="data.pay.pay_status == 0 && data.pay.received_money == 0">未支付</div>
@ -204,12 +204,12 @@
</template>
<script>
const timesfm = require('@/common/js/map/message.js')
import eventBus from '@/common/js/bus.js'
import {
const timesfm = require('@/common/js/map/message.js')
import eventBus from '@/common/js/bus.js'
import {
computed
} from "vue"
export default {
} from "vue"
export default {
data() {
return {
show: false,
@ -409,14 +409,14 @@
}
}
}
}
</script>
<style lang="scss">
.lan{
.lan{
color: #21BBF3;
}
.Special-rating{
}
.Special-rating{
width: 630rpx;
background: #FFFFFF;
border-radius: 24px;
@ -427,11 +427,11 @@
box-sizing: border-box;
padding-bottom: 32rpx;
}
.empty-fixed{
}
.empty-fixed{
margin-top: 0 !important;
}
.Special-rating div:nth-child(1){
}
.Special-rating div:nth-child(1){
margin-top: 40rpx;
text-align: center;
font-size: 32rpx;
@ -439,8 +439,8 @@
font-weight: 500;
color: #222222;
line-height: 44rpx;
}
.Special-rating div:nth-child(2){
}
.Special-rating div:nth-child(2){
font-size: 28rpx;
font-family: PingFangSC-Regular, PingFang SC;
font-weight: 400;
@ -448,8 +448,8 @@
line-height: 40rpx;
margin-top: 30rpx;
margin-left: 28rpx;
}
.Special-rating div:nth-child(3){
}
.Special-rating div:nth-child(3){
margin-top: 24rpx;
height: 70rpx;
div:nth-child(1){
@ -492,8 +492,8 @@
right: 24rpx;
}
}
}
.Special-rating div:nth-child(4){
}
.Special-rating div:nth-child(4){
height: 160rpx;
margin-top: 24rpx;
div:nth-child(1){
@ -515,8 +515,8 @@
margin-top: 0;
}
}
.Special-rating div:nth-child(5){
}
.Special-rating div:nth-child(5){
width: 570rpx;
height: 68rpx;
font-size: 24rpx;
@ -526,8 +526,8 @@
line-height: 34rpx;
margin: 0 auto;
margin-top: 16rpx;
}
.Special-rating div:nth-child(6){
}
.Special-rating div:nth-child(6){
margin-top: 44rpx;
div:nth-child(1){
margin: 0;
@ -555,9 +555,9 @@
line-height: 40rpx;
}
}
}
.transportation{
.transportation{
width: 540rpx;
height: 448rpx;
background: #FFFFFF;
@ -597,8 +597,8 @@
margin-left: 32rpx;
padding: 0;
}
}
.transportation div:nth-child(1){
}
.transportation div:nth-child(1){
font-size: 32rpx;
font-family: PingFangSC-Medium, PingFang SC;
font-weight: 500;
@ -606,8 +606,8 @@
line-height: 44rpx;
text-align: center;
margin-top: 40rpx;
}
.transportation div:nth-child(2){
}
.transportation div:nth-child(2){
font-size: 28rpx;
font-family: PingFangSC-Regular, PingFang SC;
font-weight: 400;
@ -618,8 +618,8 @@
text:nth-child(2){
margin-left: 16rpx;
}
}
.transportation div:nth-child(3){
}
.transportation div:nth-child(3){
div:nth-child(1){
width: 112rpx;
height: 40rpx;
@ -655,17 +655,17 @@
line-height: 40rpx;
}
}
}
.fill-in{
}
.fill-in{
font-size: 24rpx;
font-family: PingFangSC-Regular, PingFang SC;
font-weight: 400;
color: #585858;
line-height: 34rpx;
margin: 20rpx 0 0 36rpx;
}
}
.nav{
.nav{
width: 750rpx;
height: 100rpx;
background: #F7F7F7;
@ -683,8 +683,8 @@
color: #222222;
line-height: 40rpx;
}
}
.nav div:nth-child(3){
}
.nav div:nth-child(3){
font-size: 28rpx;
font-family: PingFangSC-Medium, PingFang SC;
font-weight: 500;
@ -694,8 +694,8 @@
height: 72rpx;
background: #21BBF3;
border-radius: 40rpx;
}
.Order-details {
}
.Order-details {
padding: 24rpx;
.Order-status {
@ -776,7 +776,7 @@
background: #FFFFFF;
border-radius: 24rpx;
margin-top: 24rpx;
padding-bottom: 20rpx;
padding-bottom: 20rpx;
box-sizing: border-box;
.Shipping-telephona {
margin-top: 16rpx;
@ -1117,5 +1117,5 @@ padding-bottom: 20rpx;
padding: 0 50rpx 0 46rpx;
}
}
}
}
</style>

122
page_salesman_order/Order_details/Order_details.vue

@ -1,8 +1,14 @@
<template>
<z-paging ref="paging" v-model="list" @query="queryList">
<!-- #ifdef H5 -->
<u-navbar title="订单详情" leftIconSize="0" @leftClick="leftClick" placeholder>
<u-icon name="arrow-left" slot="left" color="#333333" size="24"></u-icon>
</u-navbar>
<!-- #endif -->
<!-- #ifdef APP-PLUS -->
<view style="padding-top: 50rpx">
</view>
<!-- #endif -->
<view class="" v-for="(item,index) in list" :key="index">
<view class="Order-details">
<view class="Order-status">
@ -132,7 +138,7 @@
<div v-else-if="data.pay.pay_status == 0 && data.pay.received_money == 0">未支付</div>
<div v-else-if="data.pay.pay_status == 0 && data.pay.pay_money > 0 && data.pay.received_money > 0">部分支付</div>
<div v-else-if="data.pay.pay_status==2">已支付</div>
<!-- <div v-else-if="data.order_status > 0 && data.sales_status == 0">已支付</div>-->
<!-- <div v-else-if="data.order_status > 0 && data.sales_status == 0">已支付</div>-->
<div v-else>暂无收款记录</div>
<!-- <div v-if="data.sales_balance==1 && data.wait_status==2">已收款</div>
<div v-if="data.sales_balance==0 && data.wait_status==1">待付款</div>
@ -251,10 +257,10 @@
@click="ConfirmCharge">确认收货</div>
<div class="df aic jcsa listtwo" v-if="data.order_status_name=='待支付'" @click="payment">去支付</div>
<div class="df aic jcsa listtwo" v-if="data.order_status==1" @click="show3=true">确认发货</div>
<!-- 暂时注释,只保留客户端的审核功能-->
<!--<div class="df aic jcsa listtwo" v-if="data.sales_status == 0" @click="show9=true">去审核</div>-->
<!--订单状态order_status在[0待支付,1待发货,20待审核] && sales_status=0时才展示取消审核-->
<!-- <div class="df aic jcsa listtwo" v-if="data.sales_status != 0 && [0,1,20].includes(data.order_status)" @click="cancelAudit(data.order_id)">取消审核</div>-->
<!-- 暂时注释,只保留客户端的审核功能-->
<!--<div class="df aic jcsa listtwo" v-if="data.sales_status == 0" @click="show9=true">去审核</div>-->
<!--订单状态order_status在[0待支付,1待发货,20待审核] && sales_status=0时才展示取消审核-->
<!-- <div class="df aic jcsa listtwo" v-if="data.sales_status != 0 && [0,1,20].includes(data.order_status)" @click="cancelAudit(data.order_id)">取消审核</div>-->
</view>
<u-overlay :show="show9">
<view class="head-one">
@ -379,13 +385,13 @@
</template>
<script>
const timesfm = require('@/common/js/map/message.js')
// import Bus from '@/common/js/bus.js'
import {
const timesfm = require('@/common/js/map/message.js')
// import Bus from '@/common/js/bus.js'
import {
computed
} from "vue"
import eventBus from '@/common/js/bus.js'
export default {
} from "vue"
import eventBus from '@/common/js/bus.js'
export default {
data() {
return {
show: false,
@ -1290,22 +1296,22 @@
}
}
}
}
</script>
<style lang="scss">
::v-deep {
::v-deep {
.zp-l-text {
display: none;
}
}
}
.xiugai {
.xiugai {
width: 204rpx;
margin-left: 4rpx;
}
}
.listacd {
.listacd {
width: 100%;
height: 100%;
background-color: rgb(247, 247, 247);
@ -1353,18 +1359,18 @@
border-radius: 20rpx;
color: #fff;
}
}
}
.list-list {
.list-list {
/* #ifdef APP */
margin-top: 20rpx;
/* #endif */
/* #ifdef H5 */
margin-top: 100rpx;
/* #endif */
}
}
.list {
.list {
width: 702rpx;
// height: 324rpx;
background: #FFFFFF;
@ -1468,9 +1474,9 @@
}
}
}
}
}
.Select-payment {
.Select-payment {
width: 702rpx;
// height: 248rpx;
background: #FFFFFF;
@ -1530,9 +1536,9 @@
margin-left: 16rpx;
}
}
}
}
.head-one {
.head-one {
width: 500rpx;
// height: 500rpx;
position: fixed;
@ -1593,9 +1599,9 @@
}
}
}
}
.Special-rating {
.Special-rating {
width: 630rpx;
background: #FFFFFF;
border-radius: 24px;
@ -1606,13 +1612,13 @@
box-sizing: border-box;
padding-bottom: 32rpx;
}
}
.empty-fixed {
.empty-fixed {
margin-top: 0 !important;
}
}
.Special-ratingone {
.Special-ratingone {
margin-top: 40rpx;
text-align: center;
font-size: 32rpx;
@ -1620,9 +1626,9 @@
font-weight: 500;
color: #222222;
line-height: 44rpx;
}
}
.Special-rating div:nth-child(2) {
.Special-rating div:nth-child(2) {
font-size: 28rpx;
font-family: PingFangSC-Regular, PingFang SC;
font-weight: 400;
@ -1630,9 +1636,9 @@
line-height: 40rpx;
margin-top: 30rpx;
margin-left: 28rpx;
}
}
.selont {
.selont {
margin-top: 24rpx;
height: 70rpx;
@ -1689,9 +1695,9 @@
right: 24rpx;
}
}
}
}
.fixed-empty {
.fixed-empty {
width: 438rpx;
height: 70rpx;
// background: red;
@ -1726,9 +1732,9 @@
transform: translateY(-50%);
right: 24rpx;
}
}
}
.Special-rating div:nth-child(4) {
.Special-rating div:nth-child(4) {
height: 160rpx;
margin-top: 24rpx;
@ -1752,9 +1758,9 @@
margin-top: 0;
}
}
}
.Special-rating div:nth-child(5) {
.Special-rating div:nth-child(5) {
width: 570rpx;
height: 68rpx;
font-size: 24rpx;
@ -1764,9 +1770,9 @@
line-height: 34rpx;
margin: 0 auto;
margin-top: 16rpx;
}
}
.Special-rating div:nth-child(6) {
.Special-rating div:nth-child(6) {
margin-top: 44rpx;
div:nth-child(1) {
@ -1796,9 +1802,9 @@
line-height: 40rpx;
}
}
}
.transportation {
.transportation {
width: 540rpx;
height: 448rpx;
background: #FFFFFF;
@ -1841,9 +1847,9 @@
margin-left: 32rpx;
padding: 0;
}
}
}
.transportation div:nth-child(1) {
.transportation div:nth-child(1) {
font-size: 32rpx;
font-family: PingFangSC-Medium, PingFang SC;
font-weight: 500;
@ -1851,9 +1857,9 @@
line-height: 44rpx;
text-align: center;
margin-top: 40rpx;
}
}
.transportation div:nth-child(2) {
.transportation div:nth-child(2) {
font-size: 28rpx;
font-family: PingFangSC-Regular, PingFang SC;
font-weight: 400;
@ -1865,9 +1871,9 @@
text:nth-child(2) {
margin-left: 16rpx;
}
}
}
.transportation div:nth-child(3) {
.transportation div:nth-child(3) {
div:nth-child(1) {
width: 112rpx;
height: 40rpx;
@ -1906,18 +1912,18 @@
line-height: 40rpx;
}
}
}
}
.fill-in {
.fill-in {
font-size: 24rpx;
font-family: PingFangSC-Regular, PingFang SC;
font-weight: 400;
color: #585858;
line-height: 34rpx;
margin: 20rpx 0 0 36rpx;
}
}
.nav {
.nav {
// width: 750rpx;
padding: 0 40rpx;
box-sizing: border-box;
@ -1963,9 +1969,9 @@
border-radius: 40rpx;
margin: 0 0rpx 0 20rpx;
}
}
}
.Order-details {
.Order-details {
padding: 24rpx;
.Order-status {
@ -2403,5 +2409,5 @@
padding: 0 50rpx 0 46rpx;
}
}
}
}
</style>

52
page_salesman_order/index/index.vue

@ -39,9 +39,9 @@
<undgbm ref=one></undgbm>
</view>
<!-- 待支付 -->
<!-- <view v-if="indexa==1">-->
<!-- <dettisl ref=two></dettisl>-->
<!-- </view>-->
<!-- <view v-if="indexa==1">-->
<!-- <dettisl ref=two></dettisl>-->
<!-- </view>-->
<!-- 待审核 -->
<view v-if="indexa==1">
<reviewed ref=sui></reviewed>
@ -77,18 +77,18 @@
</template>
<script>
import tabbar from "@/components/pageSalesman/tabbar/tabbar.vue"
import received from "@/page_salesman_index/index/received.vue"//-
import close from "@/page_salesman_index/index/close.vue"//-
import deliveredsa from "@/page_salesman_index/index/delivered.vue"
import undgbm from "@/page_salesman_order/undgbm/undgbm.vue"
import dettisl from "@/page_salesman_order/Order_dettisl/Order_dettisl.vue"
import Tobeshipped from "@/page_salesman_index/index/shipped.vue"//-
import reviewed from "@/page_salesman_index/index/reviewed.vue"//-
import Collectionto from "@/page_salesman_index/index/beconfirmed.vue"//-()
import Goodsto from "@/page_salesman_index/index/bereceived.vue"//-
import selectPopup from "@/page_salesman_reportForm/index/selectPopup.vue"
export default {
import tabbar from "@/components/pageSalesman/tabbar/tabbar.vue"
import received from "@/page_salesman_index/index/received.vue"//-
import close from "@/page_salesman_index/index/close.vue"//-
import deliveredsa from "@/page_salesman_index/index/delivered.vue"
import undgbm from "@/page_salesman_order/undgbm/undgbm.vue"
import dettisl from "@/page_salesman_order/Order_dettisl/Order_dettisl.vue"
import Tobeshipped from "@/page_salesman_index/index/shipped.vue"//-
import reviewed from "@/page_salesman_index/index/reviewed.vue"//-
import Collectionto from "@/page_salesman_index/index/beconfirmed.vue"//-()
import Goodsto from "@/page_salesman_index/index/bereceived.vue"//-
import selectPopup from "@/page_salesman_reportForm/index/selectPopup.vue"
export default {
components: {
tabbar,
received,
@ -310,11 +310,11 @@
});
}
}
}
}
</script>
<style lang="scss">
::v-deep {
::v-deep {
.u-tabs__wrapper__nav__item {
padding: 0 20rpx;
}
@ -330,9 +330,9 @@
}
}
}
.input {
.input {
padding: 0 32rpx;
height: 100rpx;
background-color: #fff;
@ -356,9 +356,9 @@
border: 0;
}
}
}
}
.list {
.list {
margin: 42rpx 24rpx 0 24rpx;
width: 702rpx;
height: 424rpx;
@ -534,13 +534,13 @@
color: #FFFFFF;
line-height: 34rpx;
}
}
}
.list-mt {
.list-mt {
margin-top: 28rpx;
}
}
.shade-head {
.shade-head {
padding: 16rpx 24rpx;
.shade {
@ -579,5 +579,5 @@
}
}
}
}
</style>

27
page_salesman_order/undgbm/undgbm.vue

@ -52,9 +52,9 @@
</template>
<script>
const timesfm = require('@/common/js/map/message.js')
import eventBus from '@/common/js/bus.js'
export default {
const timesfm = require('@/common/js/map/message.js')
import eventBus from '@/common/js/bus.js'
export default {
data() {
return {
show1: false,
@ -286,23 +286,23 @@
}
},
}
}
</script>
<style lang="scss">
.box {
.box {
margin-top: -28rpx;
}
}
.box .list:nth-child(1) {
.box .list:nth-child(1) {
margin: 34rpx 24rpx 0 24rpx !important;
// margin: 0 !important;
}
}
.list {
.list {
margin: 42rpx 24rpx 0 24rpx;
width: 702rpx;
//height: 424rpx;
height: 480rpx;
background: #FFFFFF;
border-radius: 24rpx;
// padding: 32rpx;
@ -450,6 +450,7 @@
.list-btn {
margin-top: 32rpx;
// height: 500rpx !important;
.listone {
width: 176rpx;
@ -492,9 +493,9 @@
}
}
}
}
.list-mt {
.list-mt {
// margin-top: 28rpx;
}
}
</style>

8
pages.json

@ -2101,10 +2101,10 @@
"pagePath": "pages/index/index",
"text": "首页"
},
// {
// "pagePath": "page_video/video/index",
// "text": "视频"
// },
{
"pagePath": "page_video/video/index",
"text": "视频"
},
{
"pagePath": "pages/goods/category",
"text": "分类"

20
pages/index/index.vue

@ -1,6 +1,7 @@
<template>
<page-meta :page-style="themeColor"></page-meta>
<view :style="{ backgroundColor: bgColor, minHeight: 'calc(100vh )' }" class="page-img">
<!-- 自定义组件 -->
@ -91,6 +92,9 @@
import diyJs from '@/common/js/diy.js';
import indexJs from './public/js/index.js';
import APPUpdate from '@/config/appUpdate.js';
import {
getCurrentNo
} from '@/config/appUpdate.js'
export default {
components: {
uniPopup
@ -108,7 +112,8 @@
},
site_tel: '',
diyGlobalData: {},
floatData: {}
floatData: {},
};
},
onLoad() {
@ -130,8 +135,21 @@
},
onShow() {
// uni.$emit('videoStart')
this.getSystem()
},
methods: {
getSystem() {
//#ifdef APP-PLUS
getCurrentNo(({
versionCode,
versionName
}) => {
console.log('========versionCode', versionName);
console.log('========versionCode', versionCode);
})
//#endif
},
goRouter(data) {
uni.navigateTo({
url: data.link.wap_url

10
pages/init.vue

@ -5,7 +5,7 @@
<image :src="item.adv_image" mode="aspectFill" class="cover" @click="goPage(item)"></image>
</swiper-item>
</swiper>
<view class="init-skip" @click="handleJump">跳过{{ time }}s</view>
<view class="init-skip" @click="handleJump" v-if="showgg">跳过{{ time }}s</view>
</div>
</template>
<script>
@ -13,6 +13,7 @@
name: "init",
data() {
return {
showgg:false,
info: {},
dataList: [],
current: 0,
@ -22,7 +23,7 @@
},
onLoad(e) {
this.getComAdvertising()
this.handleJump()
// this.handleJump()
this.timer = setInterval(() => {
if (this.time > 0) {
this.time--
@ -61,8 +62,9 @@
url: '/api/adv/appstartadvlist',
data: {},
success: res => {
console.log(res, 'res')
if (!res.code) {
if (res.code==0&&res.data.data.length!=0) {
console.log('-------------广告',res.data.data)
this.showgg = true
this.dataList = res.data.data
} else {
this.handleJump()

54
pages/order/list.vue

@ -93,9 +93,9 @@
</text>
</text>
<!-- <text v-if="goodsItem.delivery_status">-->
<!-- {{goodsItem.delivery_status_name}}-->
<!-- </text>-->
<!-- <text v-if="goodsItem.delivery_status">-->
<!-- {{goodsItem.delivery_status_name}}-->
<!-- </text>-->
<!--支付状态-->
<text v-if="orderItem.pay.pay_status == 2">
@ -172,10 +172,10 @@
@click="operation(operationItem.action, orderItem)">
{{ operationItem.title }}
</view>
<view class="order-box-btn color-base-border color-base-text" v-if="!orderItem.is_invoice"
<!-- <view class="order-box-btn color-base-border color-base-text" v-if="!orderItem.is_invoice"
@click="openInvoice(orderItem)">
申请开票
</view>
</view> -->
</view>
@ -189,10 +189,10 @@
<text v-if="orderItem.evaluate_status == 0">评价</text>
<text v-else-if="orderItem.evaluate_status == 1">追评</text>
</view>
<view class="order-box-btn color-base-border color-base-text" v-if="!orderItem.is_invoice"
<!-- <view class="order-box-btn color-base-border color-base-text" v-if="!orderItem.is_invoice"
@click="openInvoice(orderItem)">
申请开票
</view>
</view> -->
<!-- <view class="order-box-btn color-base-border color-base-text"
@click="getInvoice(orderItem)"
v-if="orderItem.is_invoice&&orderItem.invoice_status">
@ -219,10 +219,10 @@
查看发票
</view>
<view class="order-box-btn color-base-border color-base-text" v-if="!orderItem.is_invoice"
<!-- <view class="order-box-btn color-base-border color-base-text" v-if="!orderItem.is_invoice"
@click="openInvoice(orderItem)">
申请开票
</view>
</view> -->
</view>
@ -295,9 +295,9 @@
</template>
<script>
import orderMethod from './public/js/orderMethod.js';
import nsPayment from '@/components/payment/payment.vue';
export default {
import orderMethod from './public/js/orderMethod.js';
import nsPayment from '@/components/payment/payment.vue';
export default {
data() {
return {
scrollInto: '',
@ -472,11 +472,11 @@
name: this.$lang('waitDelivery'),
id: 'status_3'
},
{
status: 'invoice',
name: '待开票',
id: 'invoice'
},
// {
// status: 'invoice',
// name: '',
// id: 'invoice'
// },
{
status: 'waitrate',
name: this.$lang('waitEvaluate'),
@ -718,13 +718,13 @@
}
}
}
};
};
</script>
<style lang="scss">
@import './public/css/list.scss';
@import './public/css/list.scss';
.cate-search {
.cate-search {
width: 100%;
height: 100rpx;
background: #ffffff;
@ -768,9 +768,9 @@
text-align: center;
}
}
}
}
.filterPopup {
.filterPopup {
width: 100vw;
position: relative;
height: 50vh;
@ -870,14 +870,14 @@
color: #ffffff;
}
}
}
}
</style>
<style scoped>
/deep/ .uni-page {
/deep/ .uni-page {
overflow: hidden;
}
}
/deep/ .mescroll-upwarp {
/deep/ .mescroll-upwarp {
padding-bottom: 100rpx;
}
}
</style>

33
pages_tool/invoice/invoice.vue

@ -37,6 +37,9 @@
<view class="" v-if="orderItem.invoice_status==0&&orderItem.is_invoice==1">
待审核
</view>
<view class="apply-ticket" v-if="orderItem.is_invoice === 0" @click="handleApplyTicket(orderItem)">
申请开票
</view>
<view class="" v-else-if="orderItem.invoice_status==1&&orderItem.is_invoice==1">
已开票
</view>
@ -127,13 +130,18 @@
name: '待开票',
}
],
curTab: 1
curTab: 1,
applyTicketOrderId: 0 // id
}
},
onShow() {
if (this.$refs.mescroll) this.$refs.mescroll.refresh();
},
methods: {
handleApplyTicket(item) {
this.applyTicketOrderId = item.order_id;
this.show = true;
},
handleChangeTab(id) {
// tab
if(this.curTab === id){
@ -156,7 +164,8 @@
page_size: mescroll.size,
order_status: "all",
invoice_status: this.curTab,
invoice: 1
// invoice: 1
invoice: 3 //
},
success: res => {
let newArr = [];
@ -191,16 +200,17 @@
this.dataList[index].changer = !this.dataList[index].changer;
},
confirmDoInvoice() {
let arr = []
this.dataList.forEach(item => {
if (item.changer) {
arr.push(item.order_id)
}
})
// let arr = []
// this.dataList.forEach(item => {
// if (item.changer) {
// arr.push(item.order_id)
// }
// })
this.$api.sendRequest({
url: "/api/order/doInvoice",
data: {
order_id: arr[0]
// order_id: arr[0]
order_id: this.applyTicketOrderId
},
success: res => {
this.$util.showToast({
@ -221,7 +231,7 @@
})
this.selectCurrentPage = !this.selectCurrentPage
},
invoiceShow() {
invoiceShow(orderItem) {
let arr = []
this.dataList.forEach(item => {
if (item.changer) {
@ -736,7 +746,8 @@
}
}
.topBtn {
.topBtn,
.apply-ticket{
background-color: #21BBF3;
color: #fff;
padding: 5rpx 20rpx;

8
pages_tool/order/refund_goods_select.vue

@ -37,7 +37,7 @@
</template>
<script>
export default {
export default {
data() {
return {
refund_type: 1,
@ -165,11 +165,11 @@
this.$forceUpdate();
}
}
}
}
</script>
<style lang="scss" scoped>
.goods-select {
.goods-select {
margin-top: 30rpx;
.top {
padding: 20rpx 30rpx;
@ -246,5 +246,5 @@
background: #e7dcdc !important;
}
}
}
}
</style>

24
pages_tool/order/refund_type_select.vue

@ -36,8 +36,8 @@
</template>
<script>
import uniPopup from '@/components/uni-popup/uni-popup.vue';
export default {
import uniPopup from '@/components/uni-popup/uni-popup.vue';
export default {
components: {
uniPopup
},
@ -106,29 +106,29 @@
});
},
}
};
};
</script>
<style lang="scss">
@import './public/css/refund.scss';
@import './public/css/refund.scss';
</style>
<style scoped>
/deep/ .uni-popup__wrapper.uni-custom .uni-popup__wrapper-box {
/deep/ .uni-popup__wrapper.uni-custom .uni-popup__wrapper-box {
background: none;
max-height: unset !important;
overflow-y: hidden !important;
}
}
/deep/ .uni-popup__wrapper {
/deep/ .uni-popup__wrapper {
border-radius: 20rpx 20rpx 0 0;
}
}
/deep/ .uni-popup {
/deep/ .uni-popup {
z-index: 8;
}
}
.sub-btn {
.sub-btn {
padding-top: 20rpx;
background-color: #FFFFFF;
}
}
</style>

2
pages_tool/order/sales_return.vue

@ -1,5 +1,5 @@
<template>
<!--仅退货申请-->
<!--仅退货申请-->
<page-meta :page-style="themeColor"></page-meta>
<view >
<view>

Loading…
Cancel
Save