linwu 1 年之前
父節點
當前提交
eb3d32a20f

+ 1 - 1
api/activity/controller/ActivityController.php

@@ -37,7 +37,7 @@ class ActivityController extends RestBaseController
         if (!empty($param['user_id'])) {
             $where[] = ['user_id', '=', $param['user_id']];
         }
-        $list = ActivityModel::where($where)->order('create_time desc')->page($page, $size)->select();
+        $list = ActivityModel::where($where)->order('start_time desc')->page($page, $size)->select();
 
         //数据处理
         if (!$list->isEmpty()) {

+ 7 - 6
applet/app.json

@@ -22,6 +22,7 @@
     "pages/my/join/join",
     "pages/article/home/home",
     "pages/webview/rcs/rcs",
+    "pages/webview/rcmap/rcmap",
     "pages/business/feedback/feedback",
     "pages/business/ad/ad",
     "pages/webview/recuperate/recuperate",
@@ -47,18 +48,18 @@
         "selectedIconPath": "common/images/tabbar/site_cur.png",
         "text": "服务地图"
       },
+      {
+        "pagePath": "pages/webview/rcmap/rcmap",
+        "iconPath": "common/images/tabbar/business.png",
+        "selectedIconPath": "common/images/tabbar/business_cur.png",
+        "text": "人才图谱"
+      },
       {
         "pagePath": "pages/rob/home/home",
         "iconPath": "common/images/tabbar/rob.png",
         "selectedIconPath": "common/images/tabbar/rob_cur.png",
         "text": "抢票"
       },
-      {
-        "pagePath": "pages/mall/home/home",
-        "iconPath": "common/images/tabbar/business.png",
-        "selectedIconPath": "common/images/tabbar/business_cur.png",
-        "text": "积分商城"
-      },
       {
         "pagePath": "pages/my/home/home",
         "iconPath": "common/images/tabbar/my.png",

+ 1 - 1
applet/pages/business/home/home.wxml

@@ -2,7 +2,7 @@
 	<view slot="content">商家</view>
 </cu-custom>
 
-<image src="/common/images/business_backgroud.jpg" style="width:750rpx;height:400rpx;" bindtap="toAd"></image>
+<!-- <image src="/common/images/business_backgroud.jpg" style="width:750rpx;height:400rpx;" bindtap="toAd"></image> -->
 <!-- 地图 -->
 <!-- <view class="business-header">
 	<map longitude="{{longitude}}" latitude="{{latitude}}" scale="15" markers="{{markers}}" style="width: 100%; height: 400rpx;"></map>

+ 2 - 1
applet/project.config.json

@@ -35,7 +35,8 @@
     "useCompilerPlugins": false,
     "minifyWXML": true,
     "useStaticServer": true,
-    "ignoreUploadUnusedFiles": true
+    "ignoreUploadUnusedFiles": true,
+    "condition": false
   },
   "compileType": "miniprogram",
   "simulatorType": "wechat",

+ 2 - 2
applet/project.private.config.json

@@ -2,7 +2,7 @@
   "description": "项目私有配置文件。此文件中的内容将覆盖 project.config.json 中的相同字段。项目的改动优先同步到此文件中。详见文档:https://developers.weixin.qq.com/miniprogram/dev/devtools/projectconfig.html",
   "setting": {
     "urlCheck": false,
-    "compileHotReLoad": false
+    "compileHotReLoad": true
   },
-  "projectname": "晋爱人才"
+  "projectname": "%E6%99%8B%E7%88%B1%E4%BA%BA%E6%89%8D"
 }