diff --git a/pages/index/index.vue b/pages/index/index.vue
index 4fd57a8..1a3e22e 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -91,7 +91,7 @@
-
+
@@ -113,7 +113,6 @@
-
@@ -140,7 +139,6 @@
-
@@ -160,7 +158,8 @@
- 去发货
+ 备注
+ 去发货
@@ -176,6 +175,21 @@
+
+
+
+
+ 订单备注
+
+
+
+
+
+
+ 确认提交
+
+
+
@@ -332,6 +346,10 @@
import ordertime from './component/timelist.vue'
import retuntop from '@/components/content-top/index.vue';
import {
+
+setAdminOrderRemark
+ } from "@/api/admin";
+ import {
merstreet,
getUserInfo
} from '@/api/user.js';
@@ -426,11 +444,11 @@
}
],
-
+ refundInfo: {},
company: '',
organization_code: '',
show: false,
-
+ refundMark: false,
where: {
page: 1,
@@ -600,6 +618,13 @@
}
},
+ //备注弹窗
+ refundModify(item) {
+ this.refundInfo = item;
+
+
+ this.refundMark = true;
+ },
//同意
agree() {
this.$refs.popup.open()
@@ -833,9 +858,9 @@
this.userInfoData = res.data
if (res.data.mer_info.length == 0) {
- uni.showModal({
- title: '暂无商户信息'
- })
+ uni.showModal({
+ title: '暂无商户信息'
+ })
} else {
this.getindex()
this.getGoods(true)
@@ -858,17 +883,47 @@
});
},
+ // 备注
+ save() {
+
+ let that = this;
+ if (!that.refundInfo.remark) {
+ return this.$util.Tips({
+ title: '请输入备注'
+ })
+ }
+ setAdminOrderRemark(that.userInfoData.service.mer_id, that.refundInfo.order_id, {
+ remark:that.refundInfo.remark
+ }).then(
+ res => {
+ this.refundMark =false;
+
+ this.$util.Tips({
+ title: res.message,
+ icon: 'success'
+ })
+ that.getGoods(true);
+ },
+ err => {
+
+ that.$util.Tips({
+ title: err
+ });
+ }
+ );
+
+ },
// 授权关闭
authColse: function(e) {
this.isShowAuth = e
},
//路由跳转
navation(item) {
- if(item.type==8){
- uni.navigateTo({
- url: '/pages/moreProject/moreProject'
- })
- }
+ if (item.type == 8) {
+ uni.navigateTo({
+ url: '/pages/moreProject/moreProject'
+ })
+ }
if (this.userid) {
if (this.userInfoData.mer_info.setting_status == 1) {
switch (item.type) {
@@ -884,7 +939,7 @@
})
break;
case 3:
-
+
uni.navigateTo({
url: '/pages/users/supply_procurement/index?type_id=12&isDetail=1&product_type=98&cate_id=' +
this.userInfoData.mer_info.category_id
@@ -917,7 +972,7 @@
})
break;
-
+
}
} else {
@@ -974,7 +1029,7 @@
}
},
-
+ //获取订单列表
getGoods: function(isPage) {
let that = this;
if (that.loadend) return;
@@ -1027,6 +1082,86 @@
position: relative;
}
+ .priceChange {
+ position: fixed;
+ width: 580upx;
+ background-color: #fff;
+ border-radius: 10upx;
+ top: 50%;
+ left: 50%;
+ margin-left: -290upx;
+ margin-top: -335upx;
+ z-index: 666;
+ transition: all 0.3s ease-in-out 0s;
+ transform: scale(0);
+ opacity: 0;
+ }
+
+ .priceChange.on {
+ opacity: 1;
+ transform: scale(1);
+ }
+
+ .priceChange .priceTitle {
+ background: url("~@/static/images/pricetitle.jpg") no-repeat;
+ background-size: 100% 100%;
+ width: 100%;
+ height: 160upx;
+ border-radius: 10upx 10upx 0 0;
+ text-align: center;
+ font-size: 40upx;
+ color: #fff;
+ line-height: 160upx;
+ position: relative;
+ }
+
+ .priceChange .priceTitle .iconfont {
+ position: absolute;
+ font-size: 40upx;
+ right: 26upx;
+ top: 23upx;
+ width: 40upx;
+ height: 40upx;
+ line-height: 40upx;
+ }
+
+ .priceChange .listChange {
+ padding: 0 40upx;
+ }
+
+ .priceChange .listChange textarea {
+ box-sizing: border-box;
+ }
+
+ .priceChange .listChange .item {
+ height: 103upx;
+ border-bottom: 1px solid #e3e3e3;
+ font-size: 32upx;
+ color: #333;
+ }
+
+ .priceChange .modify {
+ font-size: 32upx;
+ color: #fff;
+ width: 490upx;
+ height: 90upx;
+ text-align: center;
+ line-height: 90upx;
+ border-radius: 45upx;
+ background-color: #2291f8;
+ margin: 53upx auto;
+ }
+
+ .priceChange .listChange textarea {
+ border: 1px solid #eee;
+ width: 100%;
+ height: 200upx;
+ margin-top: 50upx;
+ border-radius: 10upx;
+ color: #333;
+ padding: 20upx;
+ }
+
.userpage-icon {
width: 60rpx;
height: 60rpx;
@@ -1324,7 +1459,7 @@
.setAgCountbtn {
display: flex;
justify-content: space-around;
- padding-bottom:120rpx ;
+ padding-bottom: 120rpx;
.setAgCountbtna {
margin-top: 40rpx;
@@ -1666,6 +1801,7 @@
.content-list-one {
padding: 25rpx 25rpx;
+ padding-bottom: 80rpx;
.list-one {
display: flex;
@@ -1836,6 +1972,45 @@
}
}
+
+
+ .list-four {
+ display: flex;
+
+ position: absolute;
+ right: 25rpx;
+ }
+
+ .list-four .btn {
+ width: 116rpx;
+ line-height: 58rpx;
+ text-align: center;
+ border: 1px solid #737373;
+ height: 58rpx;
+ border-radius: 30rpx 30rpx;
+ opacity: 1;
+ font-size: 26rpx;
+
+ font-family: PingFang SC-Regular, PingFang SC;
+ font-weight: 400;
+ color: #737373 !important;
+ }
+
+ .list-four .btn1 {
+ margin-left: 32rpx;
+ width: 142rpx;
+ line-height: 58rpx;
+ text-align: center;
+ border: 1px solid #F84221;
+ height: 58rpx;
+ border-radius: 30rpx 30rpx;
+ opacity: 1;
+ font-size: 26rpx;
+ font-family: PingFang SC-Regular, PingFang SC;
+ font-weight: 400;
+ color: #F84221 !important;
+ }
+
}
}