1109

app.js

@@ -1,35 +1,38 @@
 //app.js
 var restAjax = require('utils/restAjax.js');
 var dialog = require('utils/dialog.js');
-var utils = require('utils/util.js');
-// + 'https://www.xzszwhy.cn/usercenter'
 App({
-	loginUrl: restAjax.baseUrl,
+  // loginUrl: 'https://www.xzszwhy.cn/usercenter',
-	usercenterUrl: restAjax.baseUrl,
+  // usercenterUrl: 'https://www.xzszwhy.cn/usercenter',
-	newsUrl: restAjax.baseUrl,
+  // newsUrl: 'https://www.xzszwhy.cn/news',
-	newsContentUrl: restAjax.url,
+  // newsContentUrl: 'https://www.xzszwhy.cn',
-	libraryUrl: restAjax.baseUrl,
+  // libraryUrl: 'https://www.xzszwhy.cn/library',
-	venueUrl: restAjax.baseUrl,
+  // venueUrl: 'https://www.xzszwhy.cn/venuebooking',
-	activityUrl: restAjax.baseUrl,
+  // activityUrl: 'https://www.xzszwhy.cn/culturalactivity',
-	volunteerUrl: restAjax.baseUrl,
+  // volunteerUrl: 'https://www.xzszwhy.cn/volunteer',
-	activityUrl: restAjax.baseUrl,
+  // activityUrl: 'https://www.xzszwhy.cn/culturalactivity',
-	volunteerUrl: restAjax.baseUrl,
+  // volunteerUrl: 'https://www.xzszwhy.cn/volunteer',
-	liveUrl: restAjax.url + 'live',
+  // liveUrl: 'https://www.xzszwhy.cn/live',
-	liveRecordUrl: restAjax.baseUrl,
+  // liveRecordUrl: 'https://www.xzszwhy.cn.ink',
-	socialUrl: restAjax.baseUrl,
+  // socialUrl: 'https://www.xzszwhy.cn/social',
-	areaCode: '540200000000',
+  // settingUrl: 'https://www.xzszwhy.cn/miniapp',
-	areaName: '日喀则市',
+
-	areaId: '640675',
+  loginUrl: 'http://219.159.20.131:8081/usercenter',
-	appId: 'wxa5c5246b283713de',
+  usercenterUrl: 'http://219.159.20.131:8081/usercenter',
-	shopUrl: restAjax.url + "xzshop",
+  newsUrl: 'http://219.159.20.131:8081/news',
-	bigDataUrl: restAjax.url + "module",
+  newsContentUrl: 'http://219.159.20.131:8081',
+  libraryUrl: 'http://219.159.20.131:8081/library',
+  venueUrl: 'http://219.159.20.131:8081/venuebooking',
+  activityUrl: 'http://219.159.20.131:8081/culturalactivity',
+  volunteerUrl: 'http://219.159.20.131:8081/volunteer',
+  activityUrl: 'http://219.159.20.131:8081/culturalactivity',
+  volunteerUrl: 'http://219.159.20.131:8081/volunteer',
+  liveUrl: 'http://219.159.20.131:8081/live',
+  liveRecordUrl: 'https://www.xzszwhy.cn.ink',
+  socialUrl: 'http://219.159.20.131:8081/social',
+  settingUrl: 'http://219.159.20.131:8081/miniapp',
   restAjax: restAjax,
-	shopImgUrl: restAjax.url + "xzshop/route/file/download/true/",
-	imgUrl: restAjax.baseUrl + "/route/file/download/true/",
-	liveImgUrl: restAjax.url + "live/route/file/download/true/",
   dialog: dialog,
-	utils: utils,
-	wssUrl: restAjax.wssUrl,
   onLaunch: function () {
     // 展示本地存储能力
     var logs = wx.getStorageSync('logs') || []
@@ -64,10 +67,6 @@ App({
     })
   },
   globalData: {
-		userInfo: null,
+    userInfo: null
-		curLat: -1,
-		curLng: -1,
-		carList: [],
-		isPublic: false,//是否关注了公众号
   }
 })

app.json

@@ -1,6 +1,7 @@
 {
   "pages": [
     "pages/index/index",
+    "pages/newsPage/newsPage",
     "pages/travel/travel",
     "pages/resource/resource",
     "pages/template/template",
@@ -9,7 +10,6 @@
     "pages/order/order",
     "pages/venue/venue",
     "pages/center/center",
-        "pages/myFriendCircle/myFriendCircle",
     "pages/friendCircle/friendCircle",
     "pages/orderDetail/orderDetail",
     "pages/broadcastList/broadcastList",
@@ -37,34 +37,13 @@
     "pages/myActivity/myActivity",
     "pages/myVolunteerTeam/myVolunteerTeam",
     "pages/myVolunteerActivity/myVolunteerActivity",
-        "pages/serviceActivityDetail/serviceActivityDetail",
+    "pages/serviceActivityDetail/serviceActivityDetail"
-		"pages/shop/shopcategory",
-		"pages/commonQrCode/commonQrCode"
-    ],
-    "subPackages": [
-        {
-            "root": "subpages/",
-            "pages": [
-                "goodslist/goodslist",
-                "goodsdetail/goodsdetail",
-                "goodscar/goodscar",
-                "goodsaddress/goodsaddress",
-                "goodsorder/goodsorder",
-                "addshopaddress/addshopaddress",
-                "editshopaddress/editshopaddress",
-                "orderconfirm/orderconfirm",
-                "addresschoose/addresschoose",
-                "webcontentview/webcontent",
-                "search/commonSearch",
-                "liverecord/liverecord"
-            ]
-        }
   ],
   "window": {
     "backgroundTextStyle": "light",
-        "navigationBarBackgroundColor": "#9F1512",
+    "navigationBarBackgroundColor": "#ffffff",
     "navigationBarTitleText": "日喀则市数字文化云",
-        "navigationBarTextStyle": "white"
+    "navigationBarTextStyle": "black"
   },
   "tabBar": {
     "color": "#BBBBBB",
@@ -90,9 +69,9 @@
         "selectedIconPath": "images/venue-on.png"
       },
       {
-                "pagePath": "pages/shop/shopcategory",
+        "pagePath": "pages/heritage/heritage",
         "iconPath": "images/culture.png",
-                "text": "商城",
+        "text": "文化",
         "selectedIconPath": "images/culture-on.png"
       },
       {
@@ -103,19 +82,11 @@
       }
     ]
   },
-    "usingComponents": {
-        "page-loading": "/components/loading/pageloading",
-        "page-empty": "/components/empty/empty",
-        "loading-more": "/components/loadmore/loading-more"
-    },
   "permission": {
     "scope.userLocation": {
       "desc": "你的位置信息将用于您当前所在位置"
     }
   },
-    "requiredPrivateInfos": [
-        "getLocation"
-    ],
   "style": "v2",
   "sitemapLocation": "sitemap.json"
 }

app.wxss

@@ -1,188 +0,0 @@
-/**app.wxss**/
-.container {
-    height: 100%;
-    display: flex;
-    flex-direction: column;
-    align-items: center;
-    justify-content: space-between;
-    padding: 200rpx 0;
-    box-sizing: border-box;
-}
-
-radio-group text {
-    font-size: 25rpx;
-}
-
-radio .wx-radio-input {
-    border-radius: 50%;
-    width: 24rpx;
-    border: 2rpx solid #5e5e5f;
-    height: 24rpx;
-}
-
-radio .wx-radio-input.wx-radio-input-checked {
-    border: none;
-    background: #07c160;
-}
-
-radio .wx-radio-input.wx-radio-input-checked::before {
-    border-radius: 50%;
-    /* 圆角 */
-    width: 28rpx;
-    /* 选中后对勾大小，不要超过背景的尺寸 */
-    height: 28rpx;
-    /* 选中后对勾大小，不要超过背景的尺寸 */
-    line-height: 28rpx;
-    text-align: center;
-    font-size: 20rpx;
-    /* 对勾大小 30rpx */
-    color: #fff;
-    /* 对勾颜色 白色 */
-    background: #07c160;
-    transform: translate(-50%, -50%) scale(1);
-}
-
-
-
-checkbox-group text {
-    font-size: 25rpx;
-
-}
-
-checkbox .wx-checkbox-input {
-    width: 24rpx;
-    border: 2rpx solid #5e5e5f;
-    height: 24rpx;
-    margin-left: 5rpx;
-}
-
-checkbox .wx-checkbox-input.wx-checkbox-input-checked {
-    border: none;
-    background: #07c160;
-}
-
-checkbox .wx-checkbox-input.wx-checkbox-input-checked::before {
-    /* 圆角 */
-    width: 28rpx;
-    /* 选中后对勾大小，不要超过背景的尺寸 */
-    height: 28rpx;
-    /* 选中后对勾大小，不要超过背景的尺寸 */
-    line-height: 28rpx;
-    text-align: center;
-    font-size: 20rpx;
-    margin-left: 5rpx;
-    /* 对勾大小 30rpx */
-    color: #fff;
-    /* 对勾颜色 白色 */
-    background: #07c160;
-    transform: translate(-50%, -50%) scale(1);
-}
-
-
-
-.text-clamp1 {
-    overflow: hidden;
-    display: -webkit-box;
-    -webkit-box-orient: vertical;
-    -webkit-line-clamp: 1;
-  }
-  
-  .text-clamp2 {
-    overflow: hidden;
-    display: -webkit-box;
-    -webkit-box-orient: vertical;
-    -webkit-line-clamp: 2;
-  }
-  
-  .text-clamp3 {
-    overflow: hidden;
-    display: -webkit-box;
-    -webkit-box-orient: vertical;
-    -webkit-line-clamp: 3;
-  }
-  
-  .text-clamp4 {
-    overflow: hidden;
-    display: -webkit-box;
-    -webkit-box-orient: vertical;
-    -webkit-line-clamp: 4;
-  }
-  
-  .text-clamp5 {
-    overflow: hidden;
-    display: -webkit-box;
-    -webkit-box-orient: vertical;
-    -webkit-line-clamp: 5;
-  }
-  
-.flex {
-    display: -webkit-box;
-    display: -webkit-flex;
-    display: flex;
-  }
-  
-  .flex-center {
-    display: -webkit-box;
-    display: -webkit-flex;
-    display: flex;
-    align-items: center;
-    justify-content: center;
-    -webkit-align-items: center;
-    -webkit-justify-content: center;
-  }
-  
-  .flex-alignStart {
-    display: -webkit-box;
-    display: -webkit-flex;
-    display: flex;
-    align-items: flex-start;
-    -webkit-align-items: flex-start;
-  }
-  
-  .flex-alignCenter {
-    display: -webkit-box;
-    display: -webkit-flex;
-    display: flex;
-    align-items: center;
-    -webkit-align-items: center;
-  }
-  
-  .flex-alignEnd {
-    display: -webkit-box;
-    display: -webkit-flex;
-    display: flex;
-    align-items: flex-end;
-    -webkit-align-items: flex-end;
-  }
-  
-  .flex-between {
-    display: -webkit-box;
-    display: -webkit-flex;
-    display: flex;
-    justify-content: space-between;
-    -webkit-justify-content: space-between;
-  }
-  
-  .flex-around {
-    display: -webkit-box;
-    display: -webkit-flex;
-    display: flex;
-    justify-content: space-around;
-    -webkit-justify-content: space-around;
-  }
-  
-  .flex-middle {
-    display: -webkit-box;
-    display: -webkit-flex;
-    display: flex;
-    justify-content: center;
-    -webkit-justify-content: center;
-  }
-  
-  .flex-end {
-    display: -webkit-box;
-    display: -webkit-flex;
-    display: flex;
-    justify-content: flex-end;
-    -webkit-justify-content: flex-end;
-  }

components/empty/empty.js

@@ -1,23 +0,0 @@
-// components/empty/empty.js
-Component({
-    /**
-     * 组件的属性列表
-     */
-    properties: {
-
-    },
-
-    /**
-     * 组件的初始数据
-     */
-    data: {
-
-    },
-
-    /**
-     * 组件的方法列表
-     */
-    methods: {
-
-    }
-})

components/empty/empty.json

@@ -1,4 +0,0 @@
-{
-    "component": true,
-    "usingComponents": {}
-}

components/empty/empty.wxml

@@ -1,5 +0,0 @@
-<!--components/empty/empty.wxml-->
-<view class="data-empty">
-    <image src="/images/ic_empty_data.png" mode="scaleToFill"></image>
-    <text class="hint">暂无数据</text>
-</view>

components/empty/empty.wxss

@@ -1,24 +0,0 @@
-/* components/empty/empty.wxss */
-.data-empty {
-    display: flex;
-    flex-direction: column;
-    justify-content: center;
-    align-items: center;
-    text-align: center;
-    align-self: center;
-
-    position: fixed;
-    top: 50%;
-    left: 50%;
-    transform: translateX(-50%)translateY(-50%);
-}
-
-.data-empty image {
-    width: 180rpx;
-    height: 120rpx;
-}
-
-.data-empty .hint {
-    margin-top: 30rpx;
-    font-size: 32rpx;
-}

components/expandabletext/expandabletext.js

@@ -1,80 +0,0 @@
-// components/expandabletext/expandabletext.js
-/**
- * 长文本内容展开与收起
- * @param {String} content  长文本内容
- * @param {Number} maxline  最多展示行数[只允许 1-5 的正整数]
- * @param {String} position  展开收起按钮位置[可选值为 left right]
- * @param {Boolean} foldable  点击长文本是否展开收起
- */
-
-Component({
-    options: {
-        addGlobalClass: true
-      },
-    /**
-     * 组件的属性列表
-     */
-    properties: {
-        content: {
-          type: String,
-          observer(val) {
-            console.log(val)
-            if (this.data.onReady) {
-              setTimeout(() => this.checkFold(), 10)
-            }
-          }
-        },
-        maxline: {
-          type: Number,
-          value: 1,
-          observer(value) {
-            if (!(/^[1-5]$/).test(value)) {
-              throw new Error(`Maxline field value can only be digits (1-5), Error value: ${value}`)
-            } else if (this.data.onReady) {
-              setTimeout(() => this.checkFold(), 10)
-            }
-          }
-        },
-        position: {
-          type: String,
-          value: "left"
-        },
-        foldable: {
-          type: Boolean,
-          value: true
-        }
-      },
-
-    /**
-     * 组件的初始数据
-     */
-    data: {
-        onFold: false,
-        showFold: false,
-        onReady: false
-    },
-    lifetimes: {
-        ready() {
-          this.checkFold()
-          this.data.onReady = true
-        }
-      },
-    /**
-     * 组件的方法列表
-     */
-    methods: {
-        checkFold() {
-            const query = wx.createSelectorQuery().in(this);
-            query.selectAll(".showArea, .hideArea").boundingClientRect(res => {
-              this.setData({
-                showFold: res[0].height < res[1].height
-              })
-            }).exec()
-          },
-          handleFold() {
-            this.setData({
-              onFold: !this.data.onFold
-            })
-          }
-    }
-})

components/expandabletext/expandabletext.json

@@ -1,4 +0,0 @@
-{
-    "component": true,
-    "usingComponents": {}
-}

components/expandabletext/expandabletext.wxml

@@ -1,7 +0,0 @@
-<view class="content">
-  <view class="contentInner showArea {{!onFold ? 'text-clamp' + maxline : ''}}" bindtap="{{foldable ? 'handleFold' : ''}}">{{content || "示例文本"}}</view>
-  <view class="contentInner hideArea">{{content || "示例文本"}}</view>
-  <view class="foldInner {{position === 'right' ? 'flex-end' : 'flex'}}" wx:if="{{showFold}}">
-    <text class="fold" catchtap="handleFold">{{onFold ? "收起" : "展开"}}</text>
-  </view>
-</view>

components/expandabletext/expandabletext.wxss

@@ -1,34 +0,0 @@
-.content {
-    width: 690rpx;
-    padding: 0 30rpx;
-    border-top: 20rpx solid transparent;
-    border-bottom: 20rpx solid transparent;
-    margin-bottom: 20rpx;
-  }
-  
-  .contentInner {
-    width: 690rpx;
-    color: #ffffff;
-    font-size: 30rpx;
-    line-height: 1.35;
-    text-align: justify;
-  }
-  
-  .hideArea {
-    display: -webkit-box;
-    overflow: hidden;
-    position: fixed;
-    top: 100vh;
-    left: -100vw;
-  }
-  
-  .foldInner {
-    width: 690rpx;
-    padding-top: 10rpx;
-  }
-  
-  .foldInner .fold {
-    color: #eb0000;
-    font-size: 32rpx;
-    cursor: pointer;
-  }

components/loading/pageloading.js

@@ -1,23 +0,0 @@
-// components/loading/pageloading.js
-Component({
-  /**
-   * 组件的属性列表
-   */
-  properties: {
-
-  },
-
-  /**
-   * 组件的初始数据
-   */
-  data: {
-
-  },
-
-  /**
-   * 组件的方法列表
-   */
-  methods: {
-
-  }
-})

components/loading/pageloading.json

@@ -1,4 +0,0 @@
-{
-  "component": true,
-  "usingComponents": {}
-}

components/loading/pageloading.wxml

@@ -1,5 +0,0 @@
-<!--components/loading/pageloading.wxml-->
-<view class="page-loading-box">
-  <image src="/images/loading-small.gif" mode="scaleToFill"></image>
-  <view class="text">加载中...</view>
-</view>

components/loading/pageloading.wxss

@@ -1,24 +0,0 @@
-/* components/loading/pageloading.wxss */
-.page-loading-box {
-    position: fixed;
-    top: 0;
-    left: 0;
-    right: 0;
-    bottom: 0;
-    /* background: rgba(255, 255, 255, 1); */
-    display: flex;
-    flex-direction: column;
-    justify-content: center;
-    align-items: center;
-    z-index: 99;
-}
-
-.page-loading-box image {
-    width: 128rpx;
-    height: 128rpx;
-}
-
-.page-loading-box .text {
-    margin-top: 20rpx;
-    font-size: 28rpx;
-}

components/loadmore/loading-more.js

@@ -1,30 +0,0 @@
-// components/loadmore/loading-more.js
-Component({
-    /**
-     * 组件的属性列表
-     */
-    properties: {
-        isShowloading: true,
-        loadingTxt: "加载中..."
-    },
-
-    /**
-     * 组件的初始数据
-     */
-    data: {
-
-    },
-
-    /**
-     * 组件的方法列表
-     */
-    methods: {
-
-    },
-    observers: {
-        'isShowloading,loadingTxt': function (ss, sss) {
-            console.log(ss)
-            console.log(sss)
-        }
-    }
-})

components/loadmore/loading-more.json

@@ -1,4 +0,0 @@
-{
-    "component": true,
-    "usingComponents": {}
-}

components/loadmore/loading-more.wxml

@@ -1,5 +0,0 @@
-<!--components/loadmore/loading-more.wxml-->
-<view class="loading-box">
-    <image src="/images/loading.gif" wx:if="{{isShowloading}}"></image>
-    <view class="loading-content">{{loadingTxt}}</view>
-</view>

components/loadmore/loading-more.wxss

@@ -1,20 +0,0 @@
-/* components/loadmore/loading-more.wxss */
-
-.loading-box {
-    width: 100%;
-    height: 80rpx;
-    display: flex;
-    flex-direction: row;
-    justify-content: center;
-    align-items: center;
-    font-size: 35rpx;
-}
-
-.loading-box image {
-    width: 40rpx;
-    height: 40rpx;
-}
-
-.loading-content {
-    margin-left: 20rpx;
-}