diff --git a/pages.json b/pages.json index 0aea24e..ea535c2 100644 --- a/pages.json +++ b/pages.json @@ -146,7 +146,16 @@ "navigationStyle": "custom" } } - ], + ,{ + "path" : "pages/margin/margin", + "style" : + { + "navigationBarTitleText": "", + "enablePullDownRefresh": false + } + + } + ], "subPackages": [{ "root": "pages/goods_cate", "name": "goods_cate", diff --git a/pages/margin/margin.vue b/pages/margin/margin.vue new file mode 100644 index 0000000..a1f7188 --- /dev/null +++ b/pages/margin/margin.vue @@ -0,0 +1,256 @@ + + + + + + \ No newline at end of file diff --git a/pages/moreProject/moreProject.vue b/pages/moreProject/moreProject.vue index 6b8389d..9101009 100644 --- a/pages/moreProject/moreProject.vue +++ b/pages/moreProject/moreProject.vue @@ -67,8 +67,8 @@ 订单核销 - - + + 保证缴纳金 @@ -183,8 +183,8 @@ 商户设置 - - + + 保证缴纳金 @@ -303,6 +303,11 @@ 商户设置 + + + + 保证缴纳金 +
{{detail.title}}
+ 甲方公司:{{company?company:"暂无公司信息"}} + 机构代码:{{organization_code?organization_code:"暂无公司信息"}} @@ -284,6 +285,7 @@ data() { return { company: '', + organization_code:'', domain: HTTP_REQUEST_URL, cartId: '', //购物车id pinkId: 0, //拼团id @@ -568,8 +570,16 @@ merstreet({ street_code: this.street_id }).then((res) => { + if(res.code==0){ + this.$util.Tips({ + title: res.msg + }); + return false; + } this.company=res.data.title - + this.organization_code=res.data.organization_code + }).catch(res=>{ + console.log(res) }) }, // 获取商户分类 diff --git a/utils/requestb.js b/utils/requestb.js index fd41a3e..e092928 100644 --- a/utils/requestb.js +++ b/utils/requestb.js @@ -27,7 +27,7 @@ function baseRequest(url, method, data, { noVerify = false }) { - let Url = 'https://ceshi-worker-task.lihaink.cn', + let Url = 'https://preview-worker-task.lihaink.cn', header = HEADER; @@ -38,7 +38,7 @@ function baseRequest(url, method, data, { uni.request({ url: Url + '/api/' + url, method: method || 'GET', - header: header, + // header: header, data: data || {}, success: (res) => { // #ifdef APP-PLUS