diff --git a/api/product.js b/api/product.js
index 8bfa886..bf8741f 100644
--- a/api/product.js
+++ b/api/product.js
@@ -303,8 +303,8 @@ export function getDeliveryType(merId) {
/*
商品 -- 获取交易协议内容
*/
-export function business() {
- return request.get(`business/agree?type=business_apply_agree`, {}, {
+export function business(data) {
+ return request.get(`business/agree`, data, {
noAuth: true
});
}
@@ -319,5 +319,5 @@ export function intention(data) {
商品 -- 同意提交申请
*/
export function intentionbus(data) {
- return request.post(`intention/business`, {});
+ return request.post(`intention/settlement`, data);
}
\ No newline at end of file
diff --git a/api/store.js b/api/store.js
index 399e35a..2a8ae0f 100644
--- a/api/store.js
+++ b/api/store.js
@@ -577,6 +577,6 @@ export function vicinityStoreApi(data) {
/*
商家入驻 -- 获取商户入驻申请协议内容
*/
-export function agreeiness() {
- return request.get(`business/agree?type=sys_intention_agree`, {}, { noAuth: true });
+export function agreeiness(data) {
+ return request.get(`business/agree`, data, { noAuth: true });
}
\ No newline at end of file
diff --git a/config/app.js b/config/app.js
index 8597d11..9053f96 100644
--- a/config/app.js
+++ b/config/app.js
@@ -10,6 +10,8 @@ let httpApiThree
// let httpApi = 'http://192.168.31.110:8324' // 测试
if (process.env.NODE_ENV === "development") {
// httpApi = 'https://shop.lihaink.cn' // 生产
+ // httpApi = 'https://test.shop.lihaink.cn' //预发布环境
+
httpApi = "https://crmeb-test.shop.lihaink.cn"
// httpApi = "http://192.168.0.222"
// httpApi = "http://192.168.0.108:8325"
@@ -25,9 +27,11 @@ if (process.env.NODE_ENV === "development") {
// #endif
} else if (process.env.NODE_ENV === 'production') {
- httpApi = 'https://shop.lihaink.cn' // 生产
+ // httpApi = 'https://shop.lihaink.cn' // 生产
- // httpApi = "https://crmeb-test.shop.lihaink.cn"
+ // httpApi ='https://test.shop.lihaink.cn' //预发布环境
+
+ httpApi = "https://crmeb-test.shop.lihaink.cn"
httpApiTwo = 'https://nk.lihaink.cn' // 生产
httpApiThree = 'http://ceshi-oa.lihaink.cn' //生产
}
diff --git a/pages.json b/pages.json
index a5b41ca..0aea24e 100644
--- a/pages.json
+++ b/pages.json
@@ -1,32 +1,32 @@
{
"pages": [
- //#ifdef APP-PLUS
- //启动页
- {
- "path": "pages/guide/judge",
- "style": {
- "enablePullDownRefresh": false,
- "onReachBottomDistance": 100,
- "navigationStyle": "custom",
- "app-plus": {
- "contentAdjust": false,
- "bounce": "none"
+ //#ifdef APP-PLUS
+ //启动页
+ {
+ "path": "pages/guide/judge",
+ "style": {
+ "enablePullDownRefresh": false,
+ "onReachBottomDistance": 100,
+ "navigationStyle": "custom",
+ "app-plus": {
+ "contentAdjust": false,
+ "bounce": "none"
+ }
}
- }
- },
- {
- "path": "pages/guide/guide",
- "style": {
- "enablePullDownRefresh": false,
- "onReachBottomDistance": 100,
- "navigationStyle": "custom",
- "app-plus": {
- "contentAdjust": false,
- "bounce": "none"
+ },
+ {
+ "path": "pages/guide/guide",
+ "style": {
+ "enablePullDownRefresh": false,
+ "onReachBottomDistance": 100,
+ "navigationStyle": "custom",
+ "app-plus": {
+ "contentAdjust": false,
+ "bounce": "none"
+ }
}
- }
- },
- // #endif
+ },
+ // #endif
//pages数组中第一项表示应用启动页，参考：https://uniapp.dcloud.io/collocation/pages
{
"path": "pages/index/index",
@@ -1122,18 +1122,6 @@
"navigationBarTitleText": "商品管理",
"enablePullDownRefresh": true
}
- },{
- "path": "transactionApplication/index",
- "style": {
- "navigationBarTitleText": "交易申请",
- "enablePullDownRefresh": false
- }
- },{
- "path": "transactionApplication/application",
- "style": {
- "navigationBarTitleText": "申请记录",
- "enablePullDownRefresh": false
- }
},
{
"path": "goodsOnSale/index",
diff --git a/pages/moreProject/moreProject.vue b/pages/moreProject/moreProject.vue
index e324809..5023a73 100644
--- a/pages/moreProject/moreProject.vue
+++ b/pages/moreProject/moreProject.vue
@@ -37,12 +37,7 @@
商户设置
-
-
-
- 交易申请
-
+
@@ -157,13 +152,8 @@
商户设置
-
-
-
- 交易申请
-
-
@@ -366,6 +346,29 @@
+
+
+
+ {{detail.title}}
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -375,12 +378,15 @@
import emptyPage from '@/components/emptyPage.vue';
import zbpSwiper from '@/components/zbpSwiper'
import {
-
+
mapGetters
} from 'vuex'
-
import {
-
+ business,
+ intentionbus
+ } from "@/api/product"
+ import {
+
getUserInfo
} from '@/api/user.js'
import {
@@ -416,11 +422,16 @@
isShow: false,
bgColor: '',
isFshow: false,
- street: ''
+ street: '',
+ detail: {},
+ tagStyle: {
+ img: 'width:100%;display:block;'
+ },
+ num: 15
};
},
computed: {
- ...mapGetters(['userInfo', 'isLogin'])
+ ...mapGetters(['userInfo', 'isLogin'])
},
created() {},
onLoad() {},
@@ -433,18 +444,95 @@
this.jurisdiction = true
}
this.getUserInfo()
-
+ this.list()
},
-
-
+
+
methods: {
- navigator(url, t) {
-
- uni.navigateTo({
- url: url
+ //同意
+ agree() {
+ intentionbus({
+ status: 1
+ }).then((res) => {
+
+ if (res.status == 200) {
+ this.$util.Tips({
+ title: res.message,
+ icon: 'success',
+ })
+ this.getUserInfo()
+ this.isFshow = false
+ }
+ }).catch((err) => {
+ this.$util.Tips({
+ title: err,
+ icon: 'error',
+ })
})
},
+ //拒绝
+ refuse() {
+ uni.switchTab({
+ url: '/pages/gather/gather'
+ })
+ },
+ //关闭弹窗
+ recuo() {
+
+ if (this.num > 0) {
+ this.num = 15
+ this.isFshow = false
+ } else {
+ this.num = 0
+ this.isFshow = false
+ }
+
+ },
+
+ countDown() {
+ let {
+ num
+ } = this;
+ // if (num === 3) this.nums = true;
+ num = num > 0 ? num - 1 : "0";
+ setTimeout(() => {
+
+ this.num = num;
+ if (num == '0') {
+ // this.launchApp()
+ return
+ }
+
+ if (this.isFshow == false && this.num > 0) {
+ this.num = 15
+ return
+ }
+ this.countDown();
+ }, 1000);
+
+
+ },
+ //获取协议内容
+ list() {
+ business({
+ type: 'mer_settlement_agree'
+ }).then(res => {
+ this.detail = res.data
+ })
+ },
+ navigator(url, t) {
+
+ if (this.userInfoData.mer_info.mer_settlement_agree_status == 0) {
+ this.isFshow = true
+ this.countDown()
+ } else {
+ uni.navigateTo({
+ url: url
+ })
+ }
+
+ },
getUserInfo: function() {
let that = this;
getUserInfo().then(res => {
@@ -473,6 +561,150 @@
background: linear-gradient(180deg, #FFFFFF 0%, #F6F6F6 100%);
}
+ .settlementAgreement {
+ width: 100%;
+ height: 100%;
+ position: fixed;
+ top: 0;
+ left: 0;
+ background: rgba(0, 0, 0, .5);
+ z-index: 10;
+ }
+
+ .settlementAgreement .setAgCount {
+ background: #fff;
+ width: 656rpx;
+ // height: 458px;
+ position: absolute;
+ top: 50%;
+ left: 50%;
+ border-radius: 12rpx;
+ -webkit-border-radius: 12rpx;
+ padding: 52rpx;
+ -webkit-transform: translate(-50%, -50%);
+ -moz-transform: translate(-50%, -50%);
+ transform: translate(-50%, -50%);
+ overflow: hidden;
+
+ .content {
+ height: 900rpx;
+ overflow-y: scroll;
+
+ /deep/ p {
+ font-size: 13px;
+ line-height: 22px;
+ }
+
+ /deep/ img {
+ max-width: 100%;
+ }
+ }
+ }
+
+ .settlementAgreement .setAgCount .icon {
+ font-size: 42rpx;
+ color: #b4b1b4;
+ position: absolute;
+ top: 15rpx;
+ right: 15rpx;
+ }
+
+ .settlementAgreement .setAgCount .title {
+ color: #333;
+ font-size: 32rpx;
+ text-align: center;
+ font-weight: bold;
+ }
+
+ .settlementAgreement .setAgCount .content {
+ margin-top: 32rpx;
+ color: #333;
+ font-size: 26rpx;
+ line-height: 22px;
+ text-align: justify;
+ text-justify: distribute-all-lines;
+ height: 756rpx;
+ overflow-y: scroll;
+ }
+
+
+ .settlementAgreement .setAgCount .contenta {
+ margin-top: 32rpx;
+ color: #333;
+ font-size: 26rpx;
+ line-height: 22px;
+ text-align: justify;
+ text-justify: distribute-all-lines;
+
+ /*#ifdef H5*/
+ height: 600rpx;
+ /*#endif*/
+ /*#ifdef APP-PLUS*/
+ height: 530rpx;
+ /*#endif*/
+
+ overflow-y: scroll;
+
+
+ }
+
+ .setAgCountbtn {
+ display: flex;
+ justify-content: space-around;
+
+ .setAgCountbtna {
+ margin-top: 40rpx;
+ width: 150rpx;
+ height: 74rpx;
+ text-align: center;
+ line-height: 74rpx;
+ border-radius: 46rpx 46rpx;
+ opacity: 1;
+ border: 2rpx solid #B3B3B3;
+ font-size: 25rpx;
+ font-family: PingFang SC-Medium, PingFang SC;
+ font-weight: 500;
+ color: #737373;
+
+ }
+
+ .setAgCountbtnb {
+ margin-top: 40rpx;
+ padding-left: 20rpx;
+ padding-right: 20rpx;
+ height: 74rpx;
+ text-align: center;
+ line-height: 74rpx;
+ background: #cecece;
+ border-radius: 46rpx 46rpx;
+ opacity: 1;
+
+ font-size: 25rpx;
+ font-family: PingFang SC-Medium, PingFang SC;
+ font-weight: 500;
+ color: #fff;
+
+ }
+
+ .setAgCountbtnc {
+ margin-top: 40rpx;
+ width: 150rpx;
+ height: 74rpx;
+ text-align: center;
+ line-height: 74rpx;
+ background: linear-gradient(270deg, #FF6D20 0%, #F84221 100%);
+ border-radius: 46rpx 46rpx;
+ opacity: 1;
+ font-size: 25rpx;
+ font-family: PingFang SC-Medium, PingFang SC;
+ font-weight: 500;
+ color: #fff;
+
+ }
+ }
+
+
+
.bg-img {
position: absolute;
width: 100%;
diff --git a/pages/product/list/index.vue b/pages/product/list/index.vue
index abb7252..21ffc85 100644
--- a/pages/product/list/index.vue
+++ b/pages/product/list/index.vue
@@ -47,7 +47,7 @@
-