@@ -196,23 +185,12 @@
-
-
+
+
-
-
-
-
-
-
-
-
-
-
@@ -221,6 +199,9 @@
+
+
+
@@ -231,22 +212,14 @@
-
-
-
-
-
-
-
-
+
@@ -274,6 +247,16 @@
+
+
+
+
+
+
+
+
+
-
+
- {{item.advertisingName}}
+ {{item.cereAdvertisingInformation.advertisingName}}
- 轮播顺序：{{item.rotationOrder}}
- 所属移动端：{{item.affiliation}}
+ 轮播顺序：{{item.cereAdvertisingInformation.rotationOrder}}
+ 所属移动端：{{item.cereAdvertisingInformation.affiliation}}
- 投放定价：100元/天
- 单次可租赁时间：1天
+ 投放定价：{{item.cereReleasePoliciesVO[0]?item.cereReleasePoliciesVO[0].rentalPrice:0}}/{{item.cereReleasePoliciesVO[0]?item.cereReleasePoliciesVO[0].leaseTerm:'月'}}
+
@@ -63,6 +63,8 @@
pageindex: {
pageNumber: 1,
pageSize: 10,
+ resourceType:'广告位',
+ dataForm:'2'
},
typeshow: false,
typeList: [
@@ -90,7 +92,7 @@
//查询全数据
getAll() {
let query = Object.assign(this.pageindex, this.query);
- this.$http.sendRequest('/cereAdvertisingInformation/queryByPage', 'POST', query, 1).then(res => {
+ this.$http.sendRequest('/cereReleaseInvestmentResources/queryByPage', 'POST', query, 1).then(res => {
//成功回调
this.tableData = res.data.data.content;
}).catch(err => {
@@ -110,9 +112,10 @@
this.search();
},
toDetail(item) {
- let items = JSON.stringify(item)
+ let items = JSON.stringify(item.cereAdvertisingInformation)
+ let celue = JSON.stringify(item.cereReleasePoliciesVO)
uni.navigateTo({
- url: `/pages/advertisementDetail/advertisementDetail?item=${items}`
+ url: `/pages/advertisementDetail/advertisementDetail?item=${items}&celue=${celue}`
})
},
@@ -151,7 +154,7 @@
pageSize: 10,
advertisingType:val[0].label
}
- this.$http.sendRequest('/cereAdvertisingInformation/likeGet', 'POST', page, 1).then(res => {
+ this.$http.sendRequest('/cereReleaseInvestmentResources/likeGet', 'POST', page, 1).then(res => {
//成功回调
this.tableData = res.data.data.content
})
diff --git a/yslvdao-miniapp/pages/field/field.vue b/yslvdao-miniapp/pages/field/field.vue
index 8252c9b..e99a620 100644
--- a/yslvdao-miniapp/pages/field/field.vue
+++ b/yslvdao-miniapp/pages/field/field.vue
@@ -66,12 +66,12 @@
-
+
- {{item.venueName}}
+ {{item.cereBasicInformationVenue.venueName}}
+
+
+ 我已阅读并同意《隐私政策》
+
+
+
+
+
+
+
+
+ 锦江绿道
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 登录
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/yslvdao-miniapp/pages/login/login.vue b/yslvdao-miniapp/pages/login/login.vue
index d477223..a4000c7 100644
--- a/yslvdao-miniapp/pages/login/login.vue
+++ b/yslvdao-miniapp/pages/login/login.vue
@@ -1,271 +1,174 @@
-
-
-
- 登录
-
+
+
+
+
-
-
-
-
- 锦江绿道
-
-
- 为了给您提供更好的服务
- 我们需要您的授权哦~
-
-
- 手机号登录
-
-
-
-
- 我已阅读并同意《隐私政策》
-
-
-
-
-
-
-
-
- 锦江绿道
+
+
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 获取验证码
+ {{num}}秒后重试
+
+
-
-
-
-
+
+
+
+ 登录
+
+
-
-
-
- 登录
-
+
+
+ 我已阅读并同意《隐私政策》
+
-
-
-
-
-
+
\ No newline at end of file
diff --git a/yslvdao-miniapp/pages/my/my.vue b/yslvdao-miniapp/pages/my/my.vue
index b2ed20c..65c2484 100644
--- a/yslvdao-miniapp/pages/my/my.vue
+++ b/yslvdao-miniapp/pages/my/my.vue
@@ -125,7 +125,22 @@
我的服务
-
+
+
+
+
+
+
+
+ 认证商家
+
+
+
+
+
+
+
+
@@ -244,7 +259,9 @@
tuiguang:'',
tongji:{},
activityNum:0,
- wenjuanNum:0
+ wenjuanNum:0,
+ user: uni.getStorageSync('user'),
+ isshopon: false
};
},
onload(){
@@ -376,44 +393,7 @@
}
},
- handleApplySettle() {
- // uni.navigateTo({
- // url: '/pages/myzili/myzili'
- // })
- const res = uni.getStorageSync('token');
- let token = Encrypt(res)
- let username = this.shopMsg.shopName
- // let url = 'http://8.130.38.56:8027/settled-merchant'
- let url = 'https://jy.scjysm.asia:18086/settled-merchant'
-
- // #ifdef H5
- console.log('h5 test')
- window.location.href = url + `/#/?username=${ username }&user=${ token }`
- // #endif
- // #ifdef APP-PLUS
- plus.runtime.openURL(url + `/#/?username=${ username }&user=${ token }`, function(
- e) {
- console.log(e);
- })
- // #endif
- // #ifdef MP-WEIXIN
- uni.navigateTo({
- url: `../linkOthers/index?url=${ url }&username=${ username }&user=${ token }`
- // 此处的链接为小程序上面新建的webview页面路径，参数url为要跳转外链的地址
- // url: '../../../pages_category_page1/linkOthers/index?url=' + encodeURIComponent(url)
- // url:'../../../pages_category_page2/userModule/coupon'
- })
- // #endif
- // #ifdef MP-ALIPAY
- uni.navigateTo({
- url: `../linkOthers/index?url=${ url }&username=${ username }&user=${ token }`
- // 此处的链接为小程序上面新建的webview页面路径，参数url为要跳转外链的地址
- // url: '../../../pages_category_page1/linkOthers/index?url=' + encodeURIComponent(url)
- // url:'../../../pages_category_page2/userModule/coupon'
- })
- // #endif
-
- },
+
myMsg(){
const res = uni.getStorageSync('token');
if(res ==''){
diff --git a/yslvdao-miniapp/pages/shops/shops.vue b/yslvdao-miniapp/pages/shops/shops.vue
index 5631302..dbb8749 100644
--- a/yslvdao-miniapp/pages/shops/shops.vue
+++ b/yslvdao-miniapp/pages/shops/shops.vue
@@ -29,12 +29,12 @@
-
+
- {{item.shopName}}
+ {{item.cereBasicInformationShop.shopName}}
@@ -127,20 +127,20 @@
]
},
],
- pageList3: [
- {
- id: 1,
- title: '销售上报与统计',
- children: [
- // { name: '文件调查', img: '/workbench1.png', path: '/pages/questionnaire/questionnaire' },
- // { name: '招商方案', img: '/workbench2.png', path: '/pages/Iproposal/Iproposal' },
- // { name: '我的活动', img: '/workbench3.png', path: '/pages/participation/participation' },
- // { name: '活动申请', img: '/workbench4.png', path: '/pages/mycreated/mycreated' },
- { name: '销售上报', img: '/workbench5.png', path: '/pages/saleReport/saleReport' },
- { name: '销售统计', img: '/workbench5.png', path: '/pages/salesReporting/salesReporting' },
- ]
- },
- ],
+ // pageList3: [
+ // {
+ // id: 1,
+ // title: '销售上报与统计',
+ // children: [
+ // // { name: '文件调查', img: '/workbench1.png', path: '/pages/questionnaire/questionnaire' },
+ // // { name: '招商方案', img: '/workbench2.png', path: '/pages/Iproposal/Iproposal' },
+ // // { name: '我的活动', img: '/workbench3.png', path: '/pages/participation/participation' },
+ // // { name: '活动申请', img: '/workbench4.png', path: '/pages/mycreated/mycreated' },
+ // { name: '销售上报', img: '/workbench5.png', path: '/pages/saleReport/saleReport' },
+ // { name: '销售统计', img: '/workbench5.png', path: '/pages/salesReporting/salesReporting' },
+ // ]
+ // },
+ // ],
scrollTop: 0,
};
},
diff --git a/yslvdao-miniapp/pagesA/leaseAdd/leaseAdd.scss b/yslvdao-miniapp/pagesA/leaseAdd/leaseAdd.scss
new file mode 100644
index 0000000..d50de53
--- /dev/null
+++ b/yslvdao-miniapp/pagesA/leaseAdd/leaseAdd.scss
@@ -0,0 +1,158 @@
+.page{
+ position: absolute;
+ left: 0;
+ top: 0;
+ width: 100%;
+ overflow-y: scroll;
+ height: calc(100% - 120rpx);
+ background-color: #f6f6f6;
+}
+.steps-box {
+ padding-top: 40rpx;
+}
+
+.add-list{
+ padding: 0 4%;
+ background-color: #FFFFFF;
+ border-radius: 20rpx;
+ margin-top: 20rpx;
+ width: 100%;
+ .list{
+ display: flex;
+ justify-content: space-between;
+ align-items: center;
+ width: 100%;
+ height: 100rpx;
+ border-bottom: 2rpx solid #f6f6f6;
+ .title{
+ display: flex;
+ align-items: center;
+ height: 100%;
+ text{
+ font-size: 26rpx;
+ color: #222222;
+ }
+ .star{
+ color: red;
+ }
+ }
+ .content{
+ display: flex;
+ align-items: center;
+ text-align: right;
+ input{
+ width: 100%;
+ color: #222222;
+ font-size: 26rpx;
+ padding-top: 6rpx;
+ /* #ifdef MP */
+ padding-top: 5rpx;
+ /* #endif */
+ }
+ image {
+ width: 20rpx;
+ height: 20rpx;
+ margin-left: 10rpx;
+ /* #ifdef MP */
+ margin-top: 5rpx;
+ /* #endif */
+ }
+ }
+ }
+ .deom-box {
+ width: 100vw;
+ display: flex !important;
+ padding: 14rpx 0;
+ background-color: #FFFFFF;
+ border-radius: 9px;
+ // margin-top: 9px;
+ width: 100%;
+ // .u-upload {
+ // .u-add-wrap {
+ // width: 304rpx !important;
+ // height: 182rpx !important;
+ // }
+ // }
+ // .u-upload {
+ // height: 88px;
+ // width: 155px;
+ // background: url(/static/images/uploadID1.png);
+ // background-size:134rpx 188rpx;
+ // background-repeat:no-repeat;
+ // }
+ .img-deom {
+ flex: 1;
+ display: flex;
+ flex-direction: column;
+ align-items: center;
+ padding: 20rpx;
+ text {
+ margin-top: 18rpx;
+ }
+ }
+ }
+}
+
+/* 保存按钮 */
+.page-footer{
+ position: fixed;
+ left: 0;
+ bottom: 0;
+ display: flex;
+ align-items: center;
+ width: 100%;
+ height: 125rpx;
+ background-color: #FFFFFF;
+ padding-bottom: constant(safe-area-inset-bottom);
+ padding-bottom: env(safe-area-inset-bottom);
+ .footer-buy{
+ display: flex;
+ align-items: center;
+ justify-content: space-between;
+ width: 100%;
+ height: 100%;
+ .cart-add{
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ width: 100%;
+ height: 100rpx;
+ background-color: #3f9b6a;
+ text{
+ font-size: 28rpx;
+ color: #FFFFFF;
+ }
+ }
+ }
+}
+
+.feedback-data{
+ width: 100%;
+ padding-bottom: 20rpx;
+ border-bottom: 2rpx solid #f6f6f6;
+ .title{
+ display: flex;
+ align-items: center;
+ height: 100rpx;
+ text{
+ font-size: 26rpx;
+ color: #222222;
+ }
+ .star{
+ color: red;
+ }
+ }
+ .voucher-img{
+ display: flex;
+ align-items: center;
+ .voucher-list {
+ width: 33%;
+ height: 100%;
+ image{
+ width: 160rpx;
+ height: 160rpx;
+ border-radius: 10rpx;
+ }
+ }
+ }
+}
\ No newline at end of file
diff --git a/yslvdao-miniapp/pagesA/leaseAdd/leaseAdd.vue b/yslvdao-miniapp/pagesA/leaseAdd/leaseAdd.vue
new file mode 100644
index 0000000..785ebac
--- /dev/null
+++ b/yslvdao-miniapp/pagesA/leaseAdd/leaseAdd.vue
@@ -0,0 +1,188 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 点击上传证件人像面
+
+
+
+
+
+
+
+ 点击上传证件国徽面
+
+
+
+
+ 上传示例
+
+
+
+ 人脸示例图
+
+
+
+ 国徽面示例图
+
+
+
+ 请拍摄证件原件，保证照片拍摄清晰，取图完整，不反光。
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/yslvdao-miniapp/static/login/icon1.png b/yslvdao-miniapp/static/login/icon1.png
new file mode 100644
index 0000000..814384c
Binary files /dev/null and b/yslvdao-miniapp/static/login/icon1.png differ
diff --git a/yslvdao-miniapp/static/login/icon2.png b/yslvdao-miniapp/static/login/icon2.png
new file mode 100644
index 0000000..5428831
Binary files /dev/null and b/yslvdao-miniapp/static/login/icon2.png differ
diff --git a/yslvdao-miniapp/static/login/icon3.png b/yslvdao-miniapp/static/login/icon3.png
new file mode 100644
index 0000000..0214be9
Binary files /dev/null and b/yslvdao-miniapp/static/login/icon3.png differ
diff --git a/yslvdao-miniapp/static/login/logo1.png b/yslvdao-miniapp/static/login/logo1.png
new file mode 100644
index 0000000..1016d2f
Binary files /dev/null and b/yslvdao-miniapp/static/login/logo1.png differ
diff --git a/yslvdao-miniapp/static/login/logo2.png b/yslvdao-miniapp/static/login/logo2.png
new file mode 100644
index 0000000..6284166
Binary files /dev/null and b/yslvdao-miniapp/static/login/logo2.png differ
diff --git a/yslvdao-miniapp/utils/request.js b/yslvdao-miniapp/utils/request.js
index 3af5249..ba0969e 100644
--- a/yslvdao-miniapp/utils/request.js
+++ b/yslvdao-miniapp/utils/request.js
@@ -16,13 +16,13 @@ const sendRequest = (url, method = 'GET', data = {}, baseUrl,contentType) => {
if(baseUrl == 1){
bases = 'https://jy.scjysm.asia:18086/admin-server' + url;
// bases = 'http://8.130.38.56:8027/admin-server' + url;
- // bases = 'http://192.168.2.193' + url;
+ // bases = 'http://192.168.2.193:9003' + url;
}else{
// bases = 'http://8.130.38.56:8027/business-server' + url;
- // bases = 'http://172.16.61.48/business-server' + url;
- bases = 'https://jy.scjysm.asia:18086/merchant-business' + url;
+ bases = 'http://192.168.8.106:9004' + url;
+ // bases = 'https://jy.scjysm.asia:18086/merchant-business' + url;
}
var token = uni.getStorageSync('token') || '';
--
libgit2 0.21.4
+