diff --git a/pages.json b/pages.json
index 48724ef..175851e 100644
--- a/pages.json
+++ b/pages.json
@@ -23,7 +23,8 @@
{
"path": "pages/index/fabu",
"style": {
- "navigationBarTitleText": "发布"
+ "navigationBarTitleText": "发布",
+ "enablePullDownRefresh": true
},
"meta": {
"sync": true,
@@ -95,7 +96,49 @@
}
}
],
- "subPackages": [{
+ "subPackages": [
+ {
+ "root": "pages/canteenRent",
+ "pages": [{
+ "path": "rentList",
+ "style": {
+ "navigationBarTitleText": "食堂招租"
+ },
+ "meta": {
+ "auth": true,
+ "title": "食堂招租"
+ }
+ },
+ {
+ "path": "rentDetail",
+ "style": {
+ "navigationBarTitleText": "招租详情"
+ },
+ "meta": {
+ "sync": true,
+ "title": "招租详情",
+ "group": "食堂招租"
+ }
+ }
+
+ ]
+ },
+ {
+ "root": "pages/school",
+ "pages": [{
+ "path": "schoolIndex",
+ "style": {
+ "navigationBarTitleText": "平台学院"
+ },
+ "meta": {
+ "auth": true,
+ "title": "平台学院"
+ }
+ }
+
+ ]
+ },
+ {
"root": "pages/goods",
"pages": [{
"path": "index",
@@ -304,6 +347,18 @@
"group": "用户中心"
}
},
+ {
+ "path": "myRelease/list",
+ "style": {
+ "navigationBarTitleText": "我的发布"
+ },
+ "meta": {
+ "auth": true,
+ "sync": true,
+ "title": "我的发布",
+ "group": "用户中心"
+ }
+ },
{
"path": "goods-collect",
"style": {
diff --git a/pages/app/sign.vue b/pages/app/sign.vue
index 747a6e2..ae87dd9 100644
--- a/pages/app/sign.vue
+++ b/pages/app/sign.vue
@@ -1,69 +1,155 @@
-
-
-
-
-
-
- 签到日历
-
- 已连续签到
- {{ state.continue_days }}
- 天
-
-
+
+
+
+
+
+ 积分商城
+
-
-
-
- {{ state.cur_year || '--' }} 年 {{ state.cur_month || '--' }} 月
-
-
-
-
-
- {{ item.title }}
-
-
+
+
+
+ 签到日历
+
+ 已连续签到
+ {{ state.continue_days }}
+ 天
+
+
-
-
-
-
-
-
-
-
-
-
- {{ item.day < 10 ? '0' + item.day : item.day }}
-
-
-
-
-
- {{ item.day < 10 ? '0' + item.day : item.day }}
-
-
-
- {{ item.day < 10 ? '0' + item.day : item.day }}
-
-
-
+
+
+
+ {{ state.cur_year || '--' }} 年 {{ state.cur_month || '--' }} 月
+
+
-
-
-
-
-
-
-
-
- 签到说明
-
+
+
+
+ {{ item.title }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ item.day < 10 ? '0' + item.day : item.day }}
+
+
+
+
+
+ {{ item.day < 10 ? '0' + item.day : item.day }}
+
+
+
+ {{ item.day < 10 ? '0' + item.day : item.day }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 发布1条信息
+ +10积分
+
+
+
+
+ 去发布
+
+
+
+
+
+
+
+
+
+
+ 每日签到
+ +10积分
+
+
+
+
+ 签到
+
+
+
+ 已签到
+
+
+
+
+
+
+
+
+
+
+
+ 每消费100元
+ +10积分
+
+
+
+
+ 去消费
+
+
+
+
+
+
+
+
+
+
+ 分享1个好友注册平台
+ +10积分
+
+
+
+
+ 去分享
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ state.signin.score }}积分
+
+ 已连续打卡{{ state.continue_days }}天
+
+
+
+ 签到成功
+
+
+
+
+
+
+
+
+
+
+ 消耗{{ state.data?.rules.replenish_num }}积分
+
+ 已连续打卡{{ state.continue_days }}天
+
+
+
+ 确认补签
+
+
+
+
+
+
+
+
+ .activity-des {
+ font-size: 26rpx;
+ font-weight: 500;
+ color: #666666;
+ line-height: 40rpx;
+ }
+
+ .topInfo {
+ background-image: url('https://jiangxiaoxian.0rui.cn/signBanner.png');
+ background-size: 100%;
+ width: 100%;
+ height: 400rpx;
+
+ .sroceShopBtn {
+ width: 164rpx;
+ height: 60rpx;
+ border-radius: 169rpx;
+ background-color: #333333;
+ color: #fcc74e;
+ display: flex;
+ justify-content: center;
+ align-items: center;
+ position: relative;
+ top: 218rpx;
+ left: 30rpx;
+ }
+
+ }
+
+ .signList {
+ width: 634rpx;
+ // height: 470rpx;
+ border-radius: 18rpx;
+ padding: 30rpx;
+ margin: 0 auto;
+ position: relative;
+ bottom: 50rpx;
+
+ .obtainSign {
+ display: flex;
+ justify-content: space-between;
+ align-items: center;
+
+ .signTask-text {
+ margin-left: 20rpx;
+
+ .textFir {
+ font-weight: bold;
+ font-size: 30rpx;
+ line-height: 30rpx;
+ color: #333333;
+ }
+
+ .textSec {
+ margin-top: 20rpx;
+ font-weight: 400;
+ font-size: 24rpx;
+ line-height: 24rpx;
+ color: #999999;
+ }
+
+ }
+
+ .signBtn {
+ width: 127rpx;
+ height: 56rpx;
+ border: 2rpx solid #333333;
+ border-radius: 12rpx;
+ display: flex;
+ justify-content: center;
+ align-items: center;
+ color: #333333;
+ }
+
+ .signedBtn {
+ width: 127rpx;
+ height: 56rpx;
+ border: 2rpx solid #999999;
+ border-radius: 12rpx;
+ display: flex;
+ justify-content: center;
+ align-items: center;
+ color: #999999;
+ }
+
+ }
+
+ .line-row {
+ width: 630rpx;
+ height: 1rpx;
+ background: #EEEEEE;
+ border-radius: 0rpx 0rpx 0rpx 0rpx;
+ margin: 30rpx 0;
+ }
+
+ }
+
\ No newline at end of file
diff --git a/pages/canteenRent/rentDetail.vue b/pages/canteenRent/rentDetail.vue
new file mode 100644
index 0000000..907e06e
--- /dev/null
+++ b/pages/canteenRent/rentDetail.vue
@@ -0,0 +1,9 @@
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/pages/canteenRent/rentList.vue b/pages/canteenRent/rentList.vue
new file mode 100644
index 0000000..eb3b172
--- /dev/null
+++ b/pages/canteenRent/rentList.vue
@@ -0,0 +1,398 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{state.model.city_name ? proCity:'地区' }}
+
+
+
+
+
+
+ {{dictLabel || '标签'}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{item.platform_title}}
+ 标签
+
+
+
+ {{item.address_city_text}}
+
+ {{item.release_time_text}}
+
+
+ {{item.views}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/pages/index/index.vue b/pages/index/index.vue
index adc2940..9bd10c4 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -7,10 +7,10 @@
-
+
- 全国
+ {{state.model.city_name ? proCity:'全国' }}
@@ -24,12 +24,12 @@
-
+
食堂招租
味揽商机 食载未来
-
+
平台学院
学知赋能成长
@@ -110,7 +110,15 @@
-
+
+
+
+
+
@@ -119,7 +127,8 @@
\ No newline at end of file
diff --git a/pages/user/myRelease/list.vue b/pages/user/myRelease/list.vue
new file mode 100644
index 0000000..4631799
--- /dev/null
+++ b/pages/user/myRelease/list.vue
@@ -0,0 +1,9 @@
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/sheep/api/index.js b/sheep/api/index.js
index 018d5aa..4f6ff4b 100644
--- a/sheep/api/index.js
+++ b/sheep/api/index.js
@@ -12,6 +12,7 @@ import pay from "./pay"
import third from "./third"
import trade from "./trade"
import user from "./user"
+import rent from "./rent"
export default {
activity,
@@ -28,5 +29,6 @@ export default {
third,
trade,
user,
+ rent,
}
diff --git a/sheep/api/rent.js b/sheep/api/rent.js
new file mode 100644
index 0000000..2637460
--- /dev/null
+++ b/sheep/api/rent.js
@@ -0,0 +1,34 @@
+import request from '@/sheep/request';
+
+export default {
+ // 招租列表
+ rentlist: (params) =>
+ request({
+ url: 'meal.information/information_list',
+ method: 'GET',
+ params,
+ custom: {
+ showLoading: false,
+ },
+ }),
+ // 标签列表
+ tagsList: (params) =>
+ request({
+ url: 'meal.information/cate_list',
+ method: 'GET',
+ params,
+ custom: {
+ showLoading: false,
+ },
+ }),
+ // detail: (id, user_coupon_id) =>
+ // request({
+ // url: 'coupon/detail',
+ // method: 'GET',
+ // params: {
+ // id: id,
+ // user_coupon_id,
+ // },
+ // }),
+
+};
\ No newline at end of file
diff --git a/sheep/ui/su-regionCity-picker/su-regionCity-picker.vue b/sheep/ui/su-regionCity-picker/su-regionCity-picker.vue
new file mode 100644
index 0000000..33d5d73
--- /dev/null
+++ b/sheep/ui/su-regionCity-picker/su-regionCity-picker.vue
@@ -0,0 +1,262 @@
+
+
+
+
+
+
+
+
+ {{ province.name }}
+
+
+
+
+ {{ city.name }}
+
+
+
+
+
+
+
+
+
+
+
+