diff --git a/api/user.js b/api/user.js
index cbc2ce4..e3700ea 100644
--- a/api/user.js
+++ b/api/user.js
@@ -21,6 +21,12 @@ export function postCreateApplyAPI(merId, data) {
export function getAdminApplyAPI(merId, data) {
return request.get(`admin/${merId}/apply`, data);
}
+/**
+ * 提现记录
+ */
+export function getAdminApplyListAPI(merId) {
+ return request.get(`admin/${merId}/lis_apply`);
+}
/**
* 获取用户信息
*
diff --git a/config/app.js b/config/app.js
index ac13477..92f9f2d 100644
--- a/config/app.js
+++ b/config/app.js
@@ -12,7 +12,7 @@ if (process.env.NODE_ENV === "development") {
httpApi = "https://crmeb-test.shop.lihaink.cn"
// httpApi = "http://192.168.0.222"
// #ifdef MP-WEIXIN
- httpApiTwo = "http://cms.com"
+ httpApiTwo = "https://nk.lihaink.cn"
httpApiThree = 'http://ceshi-oa.lihaink.cn'
// #endif
// #ifdef H5
diff --git a/pages/admin/cancellate_result/index.vue b/pages/admin/cancellate_result/index.vue
index bf46416..2614b9e 100644
--- a/pages/admin/cancellate_result/index.vue
+++ b/pages/admin/cancellate_result/index.vue
@@ -159,8 +159,8 @@
title: res
});
setTimeout(()=>{
- uni.navigateTo({
- url: '/pages/admin/order_cancellation/index?mer_id='+that.mer_id
+ uni.navigateBack({
+ delta:1
});
},500)
})
@@ -205,8 +205,8 @@
title: res
});
setTimeout(()=>{
- uni.navigateTo({
- url: '/pages/admin/order_cancellation/index?mer_id='+that.mer_id
+ uni.navigateBack({
+ delta:1
});
},500)
});
diff --git a/pages/admin/order_cancellation/index.vue b/pages/admin/order_cancellation/index.vue
index beecab3..2f54607 100644
--- a/pages/admin/order_cancellation/index.vue
+++ b/pages/admin/order_cancellation/index.vue
@@ -71,6 +71,10 @@
this.isWeixin = true;
}
// #endif
+ //7458322156308800
+ },
+ onHide() {
+ this.verify_code=''
},
methods: {
/**
@@ -98,8 +102,6 @@
if (!ref.test(this.verify_code)) return self.$util.Tips({
title: '请输入正确的核销码'
});
-
-
self.$util.Tips({
title: '查询中'
});
diff --git a/pages/gather/gather.vue b/pages/gather/gather.vue
index c8eb5a9..5367a50 100644
--- a/pages/gather/gather.vue
+++ b/pages/gather/gather.vue
@@ -33,7 +33,7 @@
商品管理
-
+
提现管理
@@ -58,7 +58,7 @@
我的店铺
+ @click="navigator(`/pages/nongKe/supply_chain/supplier?type_id=12&isDetail=1&product_type=98&cate_id=${userInfoData.mer_info.category_id}`)">
供货采购
@@ -77,7 +77,7 @@
入库管理
-
+
提现管理
@@ -123,7 +123,7 @@
里海云仓
+ @click="navigator(`/pages/nongKe/supply_chain/supplier?type_id=12&isDetail=1&product_type=98&cate_id=${userInfoData.mer_info.category_id}`)">
供货采购
@@ -142,7 +142,7 @@
入库管理
-
+
提现管理
@@ -275,6 +275,7 @@
if (!res.data.mer_info) {
that.$set(this, 'jurisdiction', false);
}
+ console.log(that.userInfoData);
});
}
}
diff --git a/pages/nongKe/supply_chain/supplier.vue b/pages/nongKe/supply_chain/supplier.vue
index 3b18058..06561bf 100644
--- a/pages/nongKe/supply_chain/supplier.vue
+++ b/pages/nongKe/supply_chain/supplier.vue
@@ -298,6 +298,7 @@
};
},
onLoad(options) {
+ console.log(options);
this.product_type = options.product_type ?? 0
if (options.street_id != undefined) {
this.sotreParam.street_id = options.street_id
diff --git a/pages/product/addGoods/index.vue b/pages/product/addGoods/index.vue
index d2cad51..af0c7da 100644
--- a/pages/product/addGoods/index.vue
+++ b/pages/product/addGoods/index.vue
@@ -735,13 +735,13 @@
setSpecifica() {
// specification 为规格 0为单规格 1为多规格
if (this.setFormData.spec_type == 0) {
- navigateTo(1, '/pages/product/addGoods/singleSpecification');
+ navigateTo(1, `/pages/product/addGoods/singleSpecification?code=${this.code}`);
return;
}
if (this.setFormData.spec_type == 1) {
let queryData = serialize(this.selectEdAttr);
setStorage('modifyPriceData', queryData);
- navigateTo(1, '/pages/product/addGoods/modifyPrice');
+ navigateTo(1, `/pages/product/addGoods/modifyPrice?code=${this.code}`);
return;
}
},
diff --git a/pages/product/addGoods/modifyPrice.vue b/pages/product/addGoods/modifyPrice.vue
index df37d0c..15e097b 100644
--- a/pages/product/addGoods/modifyPrice.vue
+++ b/pages/product/addGoods/modifyPrice.vue
@@ -175,7 +175,7 @@ export default {
isBatchOperation: false, // 是否开始批量操作
multiSpecificationList: [],
addMultiSpecification: [],
- attrObj: {},
+ attrObj: '',
index: 0,
imgName: "",
batchData: {
@@ -193,9 +193,12 @@ export default {
};
},
onLoad(opt) {
- this.attrObj = opt;
+ this.attrObj = opt.code;
+
+
},
onShow() {
+
this.initData();
},
watch: {
@@ -211,8 +214,7 @@ export default {
},
batchData:{
handler(val){
- console.log(val);
- this.multiSpecificationList
+ this.multiSpecificationList.bar_code=this.attrObj
setStorage('attrValue', this.multiSpecificationList);
},
deep:true,
@@ -230,6 +232,7 @@ export default {
this.multiSpecificationList.forEach(item => {
this.$set(item, 'more_thanFlag', false);
this.$set(item, 'select', false);
+ this.$set(item,'bar_code',this.attrObj)
});
},
// 选择图片
diff --git a/pages/product/addGoods/singleSpecification.vue b/pages/product/addGoods/singleSpecification.vue
index ad871b0..c2b45ac 100644
--- a/pages/product/addGoods/singleSpecification.vue
+++ b/pages/product/addGoods/singleSpecification.vue
@@ -114,6 +114,10 @@
deep: true
}
},
+ onLoad(option) {
+ console.log(option);
+ this.singleSpecification.bar_code=option.code
+ },
onShow() {
if(getStorage('addGoodsFormData').image) {
this.singleSpecification.image = getStorage('addGoodsFormData').image;
diff --git a/pages/product/basicSet.vue b/pages/product/basicSet.vue
index b917345..983e510 100644
--- a/pages/product/basicSet.vue
+++ b/pages/product/basicSet.vue
@@ -138,7 +138,7 @@
-
@@ -343,6 +343,7 @@
sizeType: ['original', 'compressed'],
sourceType: ['album', 'camera'],
success: function(res) {
+ console.log(res);
uni.showLoading({ title: '上传中...' })
uploads(res.tempFilePaths[0], 'img').then(res => {
that.images[i].img = res
diff --git a/pages/users/embody/embody.vue b/pages/users/embody/embody.vue
index f0e303c..152b144 100644
--- a/pages/users/embody/embody.vue
+++ b/pages/users/embody/embody.vue
@@ -153,6 +153,7 @@
+ 明细
@@ -483,6 +484,13 @@
(action && this[action]) && this[action](value);
this.currentTab = opt.type
},
+ //明细跳转
+ navigator(url, t) {
+ // if (this.userInfoData.is_wsxx === 0 && t != '商户设置') return Toast("请完善商户信息");
+ uni.navigateTo({
+ url: url
+ })
+ },
}
}
@@ -735,4 +743,18 @@
uni-toast.uni-mask {
background-color: rgba(0, 0, 0, 0.5) !important;
}
+ .saomaCode {
+ z-index: 999;
+ position: fixed;
+ bottom: 175.44rpx;
+ right: 28.07rpx;
+ width: 87.72rpx;
+ height: 87.72rpx;
+ border-radius: 175.44rpx;
+ background-image: linear-gradient(90deg, #FA6514 0%, #E93323 100%);
+ color: #fff;
+ text-align: center;
+ line-height: 87.72rpx;
+ }
+
\ No newline at end of file
diff --git a/pages/users/gather_list/index.vue b/pages/users/gather_list/index.vue
index f0a25d5..fb84a80 100644
--- a/pages/users/gather_list/index.vue
+++ b/pages/users/gather_list/index.vue
@@ -4,17 +4,17 @@
-
+
提现次数
-
+
提现总额
-
- 申请提现
+
+ 立即提现
@@ -30,11 +30,11 @@