diff --git a/page_goods/orderDetail/orderDetail.vue b/page_goods/orderDetail/orderDetail.vue index 39e0893..33a78ba 100644 --- a/page_goods/orderDetail/orderDetail.vue +++ b/page_goods/orderDetail/orderDetail.vue @@ -9,6 +9,7 @@ 待支付 + 待发货 {{ orderData.order_status_name }} （{{ orderData.promotion_status_name }}） diff --git a/page_salesman_index/index/beconfirmed.vue b/page_salesman_index/index/beconfirmed.vue index cb120c9..3707f1a 100644 --- a/page_salesman_index/index/beconfirmed.vue +++ b/page_salesman_index/index/beconfirmed.vue @@ -166,7 +166,7 @@ btn(order, member) { let _this = this setTimeout(() => { - eventBus.$emit('urlone', 6) + eventBus.$emit('urlone', 5) }, 500) console.log(order, member); diff --git a/page_salesman_index/index/bereceived.vue b/page_salesman_index/index/bereceived.vue index 9bd7a1c..e2cae4f 100644 --- a/page_salesman_index/index/bereceived.vue +++ b/page_salesman_index/index/bereceived.vue @@ -171,7 +171,7 @@ // order 订单id member 下单客户id let _this = this setTimeout(() => { - eventBus.$emit('urlone', 4) + eventBus.$emit('urlone', 3) }, 500) console.log(order, member); uni.navigateTo({ diff --git a/page_salesman_index/index/close.vue b/page_salesman_index/index/close.vue index 656038d..90af0f6 100644 --- a/page_salesman_index/index/close.vue +++ b/page_salesman_index/index/close.vue @@ -176,7 +176,7 @@ console.log(order, member); let _this = this setTimeout(() => { - eventBus.$emit('urlone', 5) + eventBus.$emit('urlone', 6) }, 500) uni.navigateTo({ diff --git a/page_salesman_index/index/index.vue b/page_salesman_index/index/index.vue index 9afeb1b..7dafdb6 100644 --- a/page_salesman_index/index/index.vue +++ b/page_salesman_index/index/index.vue @@ -318,7 +318,7 @@ this.headimg = res.data.headimg this.nickname = res.data.realname - if (!authList || authList.length <= 0) { + if (!authList || authList.length <= 0 || 1==1) { //权限设置 this.box = true this.$api.sendRequest({ diff --git a/page_salesman_index/index/received.vue b/page_salesman_index/index/received.vue index 625a490..d90f975 100644 --- a/page_salesman_index/index/received.vue +++ b/page_salesman_index/index/received.vue @@ -177,7 +177,7 @@ console.log(order, member); let _this = this setTimeout(() => { - eventBus.$emit('urlone', 5) + eventBus.$emit('urlone', 4) }, 500) uni.navigateTo({ diff --git a/page_salesman_index/index/reviewed.vue b/page_salesman_index/index/reviewed.vue index eeac09f..3a9e2fc 100644 --- a/page_salesman_index/index/reviewed.vue +++ b/page_salesman_index/index/reviewed.vue @@ -197,7 +197,7 @@ btn(order, member) { let _this = this setTimeout(() => { - eventBus.$emit('urlone', 2) + eventBus.$emit('urlone', 1) }, 500) // order 订单id member 下单客户id diff --git a/page_salesman_index/index/shipped.vue b/page_salesman_index/index/shipped.vue index 4b4b267..a0a9a8d 100644 --- a/page_salesman_index/index/shipped.vue +++ b/page_salesman_index/index/shipped.vue @@ -44,8 +44,8 @@ @click.stop="increased(item,item.order_id,item.member_id)">新增收款
确认收款
- -
取消审核
+ +
再次订购
 @@ -182,7 +182,7 @@ btn(order, member) { let _this = this setTimeout(() => { - eventBus.$emit('urlone', 3) + eventBus.$emit('urlone', 2) }, 500) uni.navigateTo({ // url:this.list[this.current.URL] diff --git a/page_salesman_order/Goods_received/Goods_received.vue b/page_salesman_order/Goods_received/Goods_received.vue index 4263d72..04d8157 100644 --- a/page_salesman_order/Goods_received/Goods_received.vue +++ b/page_salesman_order/Goods_received/Goods_received.vue @@ -1,1121 +1,2407 @@ +::v-deep { + .zp-l-text { + display: none; + } +} + +.xiugai { + width: 204rpx; + margin-left: 4rpx; +} + +.listacd { + width: 100%; + height: 100%; + background-color: rgb(247, 247, 247); + overflow-y: scroll; + /* #ifdef APP */ + padding: 100rpx 0 0 0; + box-sizing: border-box; + + /* #endif */ + .wuliu { + width: 700rpx; + margin: 0 auto; + background-color: #fff; + padding: 10rpx; + box-sizing: border-box; + border-radius: 20rpx; + margin-top: 20rpx; + } + + .uinput { + width: 700rpx; + margin: 0 auto; + margin-top: 20rpx; + border-radius: 20rpx; + background-color: #fff; + } + + .one { + width: 300rpx; + margin-top: 80rpx; + padding: 10rpx; + box-sizing: border-box; + border-radius: 20rpx; + border: 1rpx solid #fff; + background-color: #fff; + + } + + .two { + width: 300rpx; + margin-top: 80rpx; + padding: 10rpx; + // box-sizing: border-box; + background-color: rgb(64, 158, 255); + border-radius: 20rpx; + color: #fff; + } +} + +.list-list { + /* #ifdef APP */ + margin-top: 20rpx; + /* #endif */ + /* #ifdef H5 */ + margin-top: 100rpx; + /* #endif */ +} + +.list { + width: 702rpx; + // height: 324rpx; + background: #FFFFFF; + border-radius: 24rpx; + margin: 0 auto; + box-sizing: border-box; + margin-top: 20rpx; + padding-bottom: 24rpx; + box-sizing: border-box; + + .list-img { + width: 176rpx; + height: 176rpx; + border-radius: 8rpx; + margin: 32rpx 24rpx 0 32rpx; + + image { + width: 176rpx; + height: 176rpx; + border-radius: 8rpx; + } + } + + .Product-Introduction { + .Product-name { + font-size: 28rpx; + font-family: PingFangSC-Regular, PingFang SC; + font-weight: 400; + color: #333333; + line-height: 40rpx; + margin-top: 32rpx; + } + + .number { + font-size: 24rpx; + font-family: PingFangSC-Regular, PingFang SC; + font-weight: 400; + color: #999999; + line-height: 34rpx; + margin-top: 32rpx; + margin-right: 40rpx; + } + + .badge { + width: 40rpx; + height: 40rpx; + + image { + width: 40rpx; + height: 40rpx; + } + } + + .stock { + font-size: 24rpx; + font-family: PingFangSC-Regular, PingFang SC; + font-weight: 400; + color: #999999; + line-height: 34rpx; + margin-top: 32rpx; + // margin-left: 90rpx; + } + + .price { + margin-top: 34rpx; + + .price-before { + font-size: 24rpx; + font-family: PingFangSC-Regular, PingFang SC; + font-weight: 400; + color: #999999; + line-height: 34rpx; + } + + .price-revise { + input { + width: 78rpx; + height: 40rpx; + background: #F6F6F6; + border-radius: 8rpx; + } + + span:nth-child(1) { + font-size: 24rpx; + font-family: PingFangSC-Regular, PingFang SC; + font-weight: 400; + color: #F33B50; + line-height: 34rpx; + margin-left: 46rpx; + margin-right: 16rpx; + } + + span:nth-child(2) { + font-size: 24rpx; + font-family: PingFangSC-Regular, PingFang SC; + font-weight: 400; + color: #999999; + line-height: 34rpx; + margin-left: 6rpx; + } + } + } + } +} + +.Select-payment { + width: 702rpx; + // height: 248rpx; + background: #FFFFFF; + border-radius: 16rpx; + margin-top: 24rpx; + padding: 32rpx; + box-sizing: border-box; + position: fixed; + top: 50%; + left: 50%; + transform: translate(-50%); + + .manili { + margin-bottom: 24rpx; + text-align: center; + color: red; + + font-size: 40rpx; + + } + + .lisr { + margin-top: 24rpx; + + .one { + padding: 10rpx 70rpx; + box-sizing: border-box; + border: 1rpx solid #ccc; + border-radius: 20rpx; + } + + .two { + padding: 10rpx 70rpx; + box-sizing: border-box; + // border: 1rpx solid #ccc; + background-color: rgb(26, 115, 232); + color: #fff; + border-radius: 20rpx; + } + } + + .arr { + margin-right: 16rpx; + margin-bottom: 32rpx; + + image { + width: 40rpx; + height: 40rpx; + } + + text { + font-size: 28rpx; + font-family: PingFangSC-Regular, PingFang SC; + font-weight: 400; + color: #333333; + line-height: 40rpx; + margin-left: 16rpx; + } + } +} + +.head-one { + width: 500rpx; + // height: 500rpx; + position: fixed; + top: 500rpx; + left: 50%; + transform: translateX(-50%); + background-color: #fff; + border-radius: 20rpx; + + .examine { + text-align: center; + margin-top: 20rpx; + } + + .one { + border: 1rpx solid #ccc; + height: 108rpx; + border-radius: 0 0 0 20rpx; + + } + + .two { + height: 112rpx; + background-color: rgb(32, 160, 255); + color: #fff; + border-radius: 0 0 20rpx 0; + } + + .radio-item { + width: 300rpx; + + display: flex; + align-items: center; + justify-content: space-between; + font-size: 28rpx; + font-family: PingFangSC-Medium, PingFang SC; + font-weight: bold; + color: #222222; + // margin: 10rpx 0; + margin: 10rpx auto; + + image { + width: 32rpx; + height: 32rpx; + } + } + + ::v-deep { + .u-radio { + margin-bottom: 32rpx; + } + + .u-radio__text { + font-size: 28rpx; + font-family: PingFangSC-Medium, PingFang SC; + font-weight: bold; + color: #222222; + } + } + +} + +.Special-rating { + width: 630rpx; + background: #FFFFFF; + border-radius: 24px; + position: fixed; + top: 240rpx; + left: 50%; + transform: translateX(-50%); + box-sizing: border-box; + padding-bottom: 32rpx; + +} + +.empty-fixed { + margin-top: 0 !important; +} + +.Special-ratingone { + margin-top: 40rpx; + text-align: center; + font-size: 32rpx; + font-family: PingFangSC-Medium, PingFang SC; + font-weight: 500; + color: #222222; + line-height: 44rpx; +} + +.Special-rating div:nth-child(2) { + font-size: 28rpx; + font-family: PingFangSC-Regular, PingFang SC; + font-weight: 400; + color: #585858; + line-height: 40rpx; + margin-top: 30rpx; + margin-left: 28rpx; +} + +.selont { + + margin-top: 24rpx; + height: 70rpx; + + // justify-content: j; + // display: flex; + .empty-fixed { + height: 70rpx; + font-size: 28rpx; + font-family: PingFangSC-Regular, PingFang SC; + font-weight: 400; + color: rgb(88, 88, 88); + line-height: 40rpx; + margin-left: 28rpx; + + span { + color: #FF3030; + } + } + + .fixed-empty { + width: 438rpx; + height: 70rpx; + // background: red; + border-radius: 16rpx; + position: relative; + margin-left: 30rpx; + margin-top: 0; + + v-deep { + .uni-input-input { + text-align: left !important; + } + } + + .inoutone { + width: 438rpx; + height: 70rpx; + // background: red; + border-radius: 16rpx; + text-align: left !important; + border: 1rpx solid #ccc; + } + + span { + font-size: 28rpx; + font-family: PingFangSC-Regular, PingFang SC; + font-weight: 400; + color: #222222; + line-height: 40rpx; + position: absolute; + top: 50%; + transform: translateY(-50%); + right: 24rpx; + } + } +} + +.fixed-empty { + width: 438rpx; + height: 70rpx; + // background: red; + border-radius: 16rpx; + position: relative; + margin-left: 30rpx; + margin-top: 0; + + v-deep { + .uni-input-input { + text-align: left !important; + } + } + + .inoutone { + width: 438rpx; + height: 70rpx; + // background: red; + border-radius: 16rpx; + text-align: left !important; + border: 1rpx solid #ccc; + } + + span { + font-size: 28rpx; + font-family: PingFangSC-Regular, PingFang SC; + font-weight: 400; + color: #222222; + line-height: 40rpx; + position: absolute; + top: 50%; + transform: translateY(-50%); + right: 24rpx; + } +} + +.Special-rating div:nth-child(4) { + height: 160rpx; + margin-top: 24rpx; + + div:nth-child(1) { + font-size: 28rpx; + font-family: PingFangSC-Regular, PingFang SC; + font-weight: 400; + color: #585858; + line-height: 40rpx; + margin-left: 28rpx; + margin-right: -12rpx; + margin-top: 0; + } + + div:nth-child(2) { + width: 438rpx; + height: 124rpx; + background: #F6F6F6; + border-radius: 16rpx; + text-align: left; + margin-top: 0; + + } +} + +.Special-rating div:nth-child(5) { + width: 570rpx; + height: 68rpx; + font-size: 24rpx; + font-family: PingFangSC-Regular, PingFang SC; + font-weight: 400; + color: #585858; + line-height: 34rpx; + margin: 0 auto; + margin-top: 16rpx; +} + +.Special-rating div:nth-child(6) { + margin-top: 44rpx; + + div:nth-child(1) { + margin: 0; + width: 206rpx; + height: 72rpx; + border-radius: 40rpx; + border: 2rpx solid #E8E8E8; + font-size: 28rpx; + font-family: PingFangSC-Regular, PingFang SC; + font-weight: 400; + color: #222222; + line-height: 40rpx; + margin: 0 32rpx 0 94rpx; + } + + div:nth-child(2) { + margin: 0; + width: 206rpx; + height: 72rpx; + background: #21BBF3; + border-radius: 40rpx; + font-size: 28rpx; + font-family: PingFangSC-Medium, PingFang SC; + font-weight: 500; + color: #FFFFFF; + line-height: 40rpx; + + } +} + +.transportation { + width: 540rpx; + height: 448rpx; + background: #FFFFFF; + border-radius: 24px; + position: fixed; + top: 418rpx; + left: 50%; + transform: translateX(-50%); + box-sizing: border-box; + + .definea { + margin-top: 38rpx; + } + + .definea div:nth-child(1) { + width: 206rpx; + height: 72rpx; + border-radius: 40rpx; + border: 2rpx solid #E8E8E8; + font-size: 28rpx; + font-family: PingFangSC-Regular, PingFang SC; + font-weight: 400; + color: #222222; + line-height: 40rpx; + margin-top: 0; + margin-left: 48rpx; + } + + .definea div:nth-child(2) { + width: 206rpx; + height: 72rpx; + background: #21BBF3; + border-radius: 40rpx; + font-size: 28rpx; + font-family: PingFangSC-Medium, PingFang SC; + font-weight: 500; + color: #FFFFFF; + line-height: 40rpx; + margin-top: 0; + margin-left: 32rpx; + padding: 0; + } +} + +.transportation div:nth-child(1) { + font-size: 32rpx; + font-family: PingFangSC-Medium, PingFang SC; + font-weight: 500; + color: #222222; + line-height: 44rpx; + text-align: center; + margin-top: 40rpx; +} + +.transportation div:nth-child(2) { + font-size: 28rpx; + font-family: PingFangSC-Regular, PingFang SC; + font-weight: 400; + color: #585858; + line-height: 40rpx; + margin-top: 30rpx; + padding-left: 38rpx; + + text:nth-child(2) { + margin-left: 16rpx; + } +} + +.transportation div:nth-child(3) { + div:nth-child(1) { + width: 112rpx; + height: 40rpx; + margin-left: 38rpx; + font-size: 28rpx; + font-family: PingFangSC-Regular, PingFang SC; + font-weight: 400; + color: #585858; + line-height: 40rpx; + } + + div:nth-child(2) { + width: 288rpx; + height: 70rpx; + background: #F6F6F6; + border-radius: 16rpx; + margin-left: 20rpx; + position: relative; + + input { + width: 288rpx; + height: 70rpx; + background: #F6F6F6; + border-radius: 16rpx; + } + + span { + position: absolute; + top: 50%; + transform: translateY(-50%); + right: 24rpx; + font-size: 28rpx; + font-family: PingFangSC-Regular, PingFang SC; + font-weight: 400; + color: #222222; + line-height: 40rpx; + } + } +} + +.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 { + // width: 750rpx; + padding: 0 40rpx; + box-sizing: border-box; + height: 100rpx; + background: #F7F7F7; + margin-top: 32rpx; + + .listone { + width: 192rpx; + height: 72rpx; + border-radius: 40rpx; + border: 2rpx solid #E8E8E8; + font-size: 28rpx; + font-family: PingFangSC-Regular, PingFang SC; + font-weight: 400; + color: #222222; + line-height: 40rpx; + + } + + .listsui { + width: 192rpx; + height: 72rpx; + border-radius: 40rpx; + border: 2rpx solid #E8E8E8; + font-size: 28rpx; + font-family: PingFangSC-Regular, PingFang SC; + font-weight: 400; + color: #222222; + line-height: 40rpx; + margin-left: 20rpx; + } + + .listtwo { + font-size: 28rpx; + font-family: PingFangSC-Medium, PingFang SC; + font-weight: 500; + color: #FFFFFF; + line-height: 40rpx; + width: 192rpx; + height: 72rpx; + background: #21BBF3; + border-radius: 40rpx; + margin: 0 0rpx 0 20rpx; + } +} + +.Order-details { + padding: 24rpx; + + .Order-status { + width: 702rpx; + height: 270rpx; + background: #FFFFFF; + border-radius: 24rpx; + + .Order-head div:nth-child(1) { + padding: 32rpx 0 28rpx 32rpx; + font-size: 28rpx; + font-family: PingFangSC-Regular, PingFang SC; + font-weight: 400; + color: #585858; + line-height: 44rpx; + } + + .Order-head div:nth-child(2) { + padding: 32rpx 0; + font-size: 28rpx; + font-family: PingFangSC-Medium, PingFang SC; + font-weight: 500; + color: #FF3B67; + line-height: 40rpx; + } + + .Order-thread { + width: 638rpx; + height: 2rpx; + background: #F2F2F2; + border-radius: 16rpx; + margin: 0 auto; + } + + .Order-number { + font-size: 28rpx; + font-family: PingFangSC-Regular, PingFang SC; + font-weight: 400; + color: #999999; + line-height: 40rpx; + padding: 28rpx 0 0 32rpx; + + span { + margin-left: 42rpx; + + font-size: 28rpx; + font-family: PingFangSC-Regular, PingFang SC; + font-weight: 400; + color: #222222; + line-height: 40rpx; + } + } + + .Order-time { + font-size: 28rpx; + font-family: PingFangSC-Regular, PingFang SC; + font-weight: 400; + color: #999999; + line-height: 40rpx; + padding: 24rpx 0 0 32rpx; + } + + .Order-time span:nth-child(1) { + margin-left: 42rpx; + font-size: 28rpx; + font-family: PingFangSC-Regular, PingFang SC; + font-weight: 400; + color: #222222; + line-height: 40rpx; + } + + + } + + .connection { + width: 702rpx; + // height: 464rpx; + background: #FFFFFF; + border-radius: 24rpx; + margin-top: 24rpx; + padding-bottom: 20rpx; + box-sizing: border-box; + + .Shipping-telephona { + margin-top: 16rpx; + font-size: 28rpx; + font-family: PingFangSC-Regular, PingFang SC; + font-weight: 400; + color: #222222; + line-height: 40rpx; + } + + .Shipping-telephone { + padding: 28rpx 0 0 0; + font-size: 28rpx; + font-family: PingFangSC-Regular, PingFang SC; + font-weight: 400; + color: #222222; + line-height: 40rpx; + + span { + margin-left: 24rpx; + font-size: 28rpx; + font-family: PingFangSC-Regular, PingFang SC; + font-weight: 400; + color: #999999; + line-height: 40rpx; + } + } + + .Shipping-address div:nth-child(1) { + width: 170rpx; + height: 40rpx; + font-size: 28rpx; + font-family: PingFangSC-Regular, PingFang SC; + font-weight: 400; + color: #585858; + line-height: 40rpx; + padding: 28rpx 0 0 32rpx; + + } + + .connection-address { + padding: 24rpx 0 0 32rpx; + font-size: 28rpx; + font-family: PingFangSC-Regular, PingFang SC; + font-weight: 400; + color: #585858; + line-height: 40rpx; + margin-bottom: 28rpx; + } + + .connection-address span:nth-child(1) { + margin-right: 40rpx; + } + + .Good-doctor { + padding: 32rpx 0 0 32rpx; + font-size: 28rpx; + font-family: PingFangSC-Regular, PingFang SC; + font-weight: 400; + color: #585858; + line-height: 40rpx; + } + + .line { + width: 638rpx; + height: 2rpx; + background: #F2F2F2; + border-radius: 16rpx; + margin: 0 auto; + } + + .connection-Rearf { + padding-top: 32rpx; + font-size: 28rpx; + font-family: PingFangSC-Medium, PingFang SC; + font-weight: 500; + color: #222222; + line-height: 40rpx; + } + + .connection-head { + + font-size: 28rpx; + font-family: PingFangSC-Regular, PingFang SC; + font-weight: 400; + color: #585858; + line-height: 44rpx; + padding: 32rpx; + + span { + width: 92rpx; + height: 36rpx; + font-size: 20rpx; + font-family: PingFangSC-Regular, PingFang SC; + font-weight: 400; + color: #FF7D02; + line-height: 28rpx; + background-color: rgb(255, 240, 226); + margin-left: 16rpx; + } + } + } + + .Commodity-list { + width: 702rpx; + // height: 542rpx; + background: #FFFFFF; + border-radius: 16rpx; + margin-top: 24rpx; + padding-bottom: 24rpx; + box-sizing: border-box; + + .transportation-expenses { + margin-top: 32rpx; + + div { + width: 174rpx; + height: 48rpx; + background: #FFFFFF; + border-radius: 28rpx; + border: 2rpx solid #E8E8E8; + text-align: center; + font-size: 24rpx; + font-family: PingFangSC-Regular, PingFang SC; + font-weight: 400; + color: #222222; + line-height: 34rpx + } + + image { + width: 32rpx; + height: 32rpx; + + } + } + + .transportation-expenses div:nth-child(1) { + margin-left: 274rpx; + margin-right: 24rpx; + } + + .set { + border: none !important; + } + + .Commodity-money { + padding: 0 32rpx; + + .money { + margin-top: 24rpx; + + .money-koude { + color: red !important; + } + } + + .money div:nth-child(1) { + font-size: 28rpx; + font-family: PingFangSC-Regular, PingFang SC; + font-weight: 400; + color: #222222; + line-height: 40rpx; + } + + .money div:nth-child(2) { + font-size: 24rpx; + font-family: DINAlternate-Bold, DINAlternate; + font-weight: bold; + color: #222222; + line-height: 40rpx; + } + } + + .dotted-line { + width: 638rpx; + height: 2rpx; + background: #F2F2F2; + border-radius: 16rpx; + margin: 0 auto; + margin-top: 28rpx; + margin-bottom: 4rpx; + } + + .Commodity-ten div:nth-child(1) { + padding: 32rpx 0 0 32rpx; + font-size: 28rpx; + font-family: PingFangSC-Regular, PingFang SC; + font-weight: 400; + color: #585858; + line-height: 44rpx; + } + + .Commodity-ten div:nth-child(2) { + font-size: 28rpx; + font-family: PingFangSC-Medium, PingFang SC; + font-weight: 500; + color: #222222; + line-height: 44rpx; + margin-top: 32rpx; + } + } + + .Collection-record { + width: 702rpx; + background: #FFFFFF; + border-radius: 24rpx; + margin-top: 24rpx; + padding: 32rpx; + box-sizing: border-box; + + .Delivery-method { + padding: 28rpx 48rpx 28rpx 0; + + } + + .Delivery-methoda { + padding: 28rpx 0rpx 28rpx 0; + + } + + + .Delivery-method div:nth-child(1) { + font-size: 30rpx; + font-family: PingFangSC-Regular, PingFang SC; + font-weight: 400; + color: #585858; + line-height: 44rpx; + } + + .Delivery-method div:nth-child(2) { + + font-size: 30rpx; + font-family: PingFangSC-Medium, PingFang SC; + font-weight: 500; + color: #222222; + line-height: 44rpx; + } + + .Delivery-methoda div:nth-child(1) { + font-size: 30rpx; + font-family: PingFangSC-Regular, PingFang SC; + font-weight: 400; + color: #585858; + line-height: 44rpx; + } + + .Delivery-methoda div:nth-child(2) { + + font-size: 30rpx; + font-family: PingFangSC-Medium, PingFang SC; + font-weight: 500; + color: #222222; + line-height: 44rpx; + } + + .copper-coin { + font-size: 28rpx; + font-family: PingFangSC-Medium, PingFang SC; + font-weight: 500; + color: #222222; + line-height: 40rpx; + margin-top: 24rpx; + margin-bottom: 28rpx; + } + + .dotted-line { + width: 638rpx; + height: 2rpx; + background: #F2F2F2; + border-radius: 16rpx; + } + + .Order-message { + margin-top: 28rpx; + font-size: 28rpx; + font-family: PingFangSC-Regular, PingFang SC; + font-weight: 400; + color: #585858; + line-height: 40rpx; + } + + .Order-departure { + margin-top: 24rpx; + font-size: 28rpx; + font-family: PingFangSC-Medium, PingFang SC; + font-weight: 500; + color: #222222; + line-height: 40rpx; + margin-bottom: 28rpx; + } + + .Order-remarks { + margin-top: 28rpx; + font-size: 28rpx; + font-family: PingFangSC-Regular, PingFang SC; + font-weight: 400; + color: #585858; + line-height: 40rpx; + } + + .importance { + margin-top: 24rpx; + margin-bottom: 28rpx; + font-size: 28rpx; + font-family: PingFangSC-Medium, PingFang SC; + font-weight: 500; + color: #222222; + line-height: 40rpx; + } + } + + .notification { + width: 540rpx; + height: 416rpx; + background: #FFFFFF; + position: fixed; + top: 572rpx; + left: 106rpx; + right: 104rpx; + border-radius: 20rpx; + box-sizing: border-box; + + .define { + border: 2rpx solid #E8E8E8; + border-bottom: none; + height: 96rpx; + margin-top: 36rpx; + } + + .define div:nth-child(1) { + border-left: none; + } + + .define div:nth-child(2) { + color: #21BBF3; + border-right: none; + } + + .point-out { + + font-size: 32rpx; + font-family: PingFangSC-Medium, PingFang SC; + font-weight: 500; + color: #222222; + line-height: 44rpx; + margin: 0 auto; + text-align: center; + margin: 40rpx 0 24rpx 0; + } + + .Text-field { + padding: 0; + padding: 0 50rpx 0 46rpx; + } + } +} + \ No newline at end of file diff --git a/page_salesman_order/Goods_received/Goods_received_COPY原版备份.vue b/page_salesman_order/Goods_received/Goods_received_COPY原版备份.vue new file mode 100644 index 0000000..4263d72 --- /dev/null +++ b/page_salesman_order/Goods_received/Goods_received_COPY原版备份.vue @@ -0,0 +1,1121 @@ + + + + + diff --git a/page_salesman_order/Order_details/Order_details.vue b/page_salesman_order/Order_details/Order_details.vue index 9fafd3f..d723dfe 100644 --- a/page_salesman_order/Order_details/Order_details.vue +++ b/page_salesman_order/Order_details/Order_details.vue @@ -251,9 +251,10 @@ @click="ConfirmCharge">确认收货
去支付
确认发货
-
去审核
+ + -
取消审核
+ diff --git a/page_salesman_order/index/index.vue b/page_salesman_order/index/index.vue index 10c804f..6b8fc23 100644 --- a/page_salesman_order/index/index.vue +++ b/page_salesman_order/index/index.vue @@ -63,7 +63,7 @@ - + @@ -78,15 +78,15 @@