gemercheung преди 11 месеца
родител
ревизия
6280e2a042

+ 2 - 0
.gitignore

@@ -0,0 +1,2 @@
+node_modules
+miniprogram_npm

+ 89 - 80
app.json

@@ -1,81 +1,90 @@
-{
-  "pages": [
-    "pages/yuezhan/index",
-    "pages/tongcheng/index",
-    "pages/swkz/index",
-    "pages/user/index",
-    "pages/yuezhan/search/index",
-    "pages/zl_detail/index",
-    "pages/cg_detail/index",
-    "pages/navigate/index",
-    "pages/user/my_order/index",
-    "pages/user/my_reward/index",
-    "pages/user/my_follow/index",
-    "pages/user/reward_detail/index",
-    "pages/yuezhan/search_result/index",
-    "pages/cg_detail/cg_introduce/index",
-    "pages/yuezhan/pay_page/index",
-    "pages/tongcheng/search/index",
-    "pages/wv_page/index",
-    "pages/user/my_comment/index",
-    "pages/user/my_saw/index",
-    "pages/zl_detail/create_evaluation/index",
-    "pages/yuezhan/comment_detail/index",
-    "pages/yuezhan/pay_page/rule_detail/index",
-    "pages/login_page/index",
-    "common/components/drop-down/index",
-    "pages/user/my_contact/index",
-    "common/components/component-list/component-list",
-    "pages/yuezhan/html_detail/index"
-  ],
-  "requiredPrivateInfos": [
-    "getLocation"
-  ],
-  "window": {
-    "backgroundTextStyle": "dark",
-    "navigationBarBackgroundColor": "#fff",
-    "navigationBarTitleText": "四维看展",
-    "backgroundColor": "#ffffff",
-    "navigationBarTextStyle": "black"
-  },
-  "tabBar": {
-    "color": "#B2B2B2",
-    "selectedColor": "#000",
-    "borderStyle": "black",
-    "list": [
-      {
-        "pagePath": "pages/yuezhan/index",
-        "text": "首页",
-        "iconPath": "imgs/yuezhan.png",
-        "selectedIconPath": "./imgs/yuezhan_active.png"
-      },
-      {
-        "pagePath": "pages/swkz/index",
-        "text": "线上看展",
-        "iconPath": "imgs/swkz.png",
-        "selectedIconPath": "./imgs/swkz_active.png"
-      },
-      {
-        "pagePath": "pages/tongcheng/index",
-        "text": "线下展讯",
-        "iconPath": "imgs/tongcheng.png",
-        "selectedIconPath": "./imgs/tongcheng_active.png"
-      },
-      {
-        "pagePath": "pages/user/index",
-        "text": "我的",
-        "iconPath": "imgs/user.png",
-        "selectedIconPath": "./imgs/user_active.png"
-      }
-    ]
-  },
-  "networkTimeout": {
-    "request": 310000
-  },
-  "permission": {
-    "scope.userLocation": {
-      "desc": "获取地理位置以便获得当前城市的展览"
-    }
-  },
-  "sitemapLocation": "sitemap.json"
+{
+  "pages": [
+    "pages/yuezhan/index",
+    "pages/tongcheng/index",
+    "pages/swkz/index",
+    "pages/user/index",
+    "pages/yuezhan/search/index",
+    "pages/zl_detail/index",
+    "pages/cg_detail/index",
+    "pages/navigate/index",
+    "pages/user/my_order/index",
+    "pages/user/my_reward/index",
+    "pages/user/my_follow/index",
+    "pages/user/reward_detail/index",
+    "pages/yuezhan/search_result/index",
+    "pages/cg_detail/cg_introduce/index",
+    "pages/yuezhan/pay_page/index",
+    "pages/tongcheng/search/index",
+    "pages/wv_page/index",
+    "pages/user/my_comment/index",
+    "pages/user/my_saw/index",
+    "pages/zl_detail/create_evaluation/index",
+    "pages/yuezhan/comment_detail/index",
+    "pages/yuezhan/pay_page/rule_detail/index",
+    "pages/login_page/index",
+    "common/components/drop-down/index",
+    "pages/user/my_contact/index",
+    "common/components/component-list/component-list",
+    "pages/yuezhan/html_detail/index",
+    "pages/course/course",
+    "pages/course_detail/course_detail",
+    "pages/user/info/info"
+  ],
+  "requiredPrivateInfos": [
+    "getLocation"
+  ],
+  "window": {
+    "backgroundTextStyle": "dark",
+    "navigationBarBackgroundColor": "#fff",
+    "navigationBarTitleText": "四维看展",
+    "backgroundColor": "#ffffff",
+    "navigationBarTextStyle": "black"
+  },
+  "tabBar": {
+    "color": "#B2B2B2",
+    "selectedColor": "#000",
+    "borderStyle": "black",
+    "list": [
+      {
+        "pagePath": "pages/yuezhan/index",
+        "text": "首页",
+        "iconPath": "imgs/yuezhan.png",
+        "selectedIconPath": "./imgs/yuezhan_active.png"
+      },
+      {
+        "pagePath": "pages/swkz/index",
+        "text": "线上看展",
+        "iconPath": "imgs/swkz.png",
+        "selectedIconPath": "./imgs/swkz_active.png"
+      },
+      {
+        "pagePath": "pages/course/course",
+        "text": "VR课堂",
+        "iconPath": "imgs/vr_classroom_n.png",
+        "selectedIconPath": "./imgs/vr_classroom_s.png"
+      },
+      {
+        "pagePath": "pages/tongcheng/index",
+        "text": "线下展讯",
+        "iconPath": "imgs/tongcheng.png",
+        "selectedIconPath": "./imgs/tongcheng_active.png"
+      },
+      {
+        "pagePath": "pages/user/index",
+        "text": "我的",
+        "iconPath": "imgs/user.png",
+        "selectedIconPath": "./imgs/user_active.png"
+      }
+    ]
+  },
+  "networkTimeout": {
+    "request": 310000
+  },
+  "permission": {
+    "scope.userLocation": {
+      "desc": "获取地理位置以便获得当前城市的展览"
+    }
+  },
+  "sitemapLocation": "sitemap.json"
 }

BIN
imgs/time.png


BIN
imgs/vr_classroom_n.png


BIN
imgs/vr_classroom_s.png


+ 25 - 0
package-lock.json

@@ -0,0 +1,25 @@
+{
+  "name": "swkz_wx",
+  "lockfileVersion": 3,
+  "requires": true,
+  "packages": {
+    "": {
+      "dependencies": {
+        "tdesign-miniprogram": "^1.6.0"
+      }
+    },
+    "node_modules/dayjs": {
+      "version": "1.11.13",
+      "resolved": "https://registry.npmmirror.com/dayjs/-/dayjs-1.11.13.tgz",
+      "integrity": "sha512-oaMBel6gjolK862uaPQOVTA7q3TZhuSvuMQAAglQDOWYO9A91IrAOUJEyKVlqJlHE0vq5p5UXxzdPfMH/x6xNg=="
+    },
+    "node_modules/tdesign-miniprogram": {
+      "version": "1.6.0",
+      "resolved": "https://registry.npmmirror.com/tdesign-miniprogram/-/tdesign-miniprogram-1.6.0.tgz",
+      "integrity": "sha512-snrDrHRZW8xyNdgeih5Daf8Ii502oIREU4N5fyKDh4ZTT4Ex366+AeQPKOO7vMeavSH0IiXl8yEVFwiM7HHATg==",
+      "dependencies": {
+        "dayjs": "^1.10.7"
+      }
+    }
+  }
+}

+ 5 - 0
package.json

@@ -0,0 +1,5 @@
+{
+  "dependencies": {
+    "tdesign-miniprogram": "^1.6.0"
+  }
+}

+ 106 - 0
pages/course/course.js

@@ -0,0 +1,106 @@
+// pages/course/course.js
+Page({
+
+  /**
+   * 页面的初始数据
+   */
+  data: {
+    testData: 20
+  },
+
+  /**
+   * 生命周期函数--监听页面加载
+   */
+  onLoad(options) {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面初次渲染完成
+   */
+  onReady() {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面显示
+   */
+  onShow() {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面隐藏
+   */
+  onHide() {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面卸载
+   */
+  onUnload() {
+
+  },
+
+  /**
+   * 页面相关事件处理函数--监听用户下拉动作
+   */
+  onPullDownRefresh() {
+
+  },
+
+  /**
+   * 页面上拉触底事件的处理函数
+   */
+  onReachBottom() {
+
+  },
+
+  /**
+   * 用户点击右上角分享
+   */
+  onShareAppMessage() {
+
+  },
+  openHost() {
+    wx.navigateToMiniProgram({
+      appId: 'wxd55ee54235e90359',
+      path: 'pages/paid-room/paid-room',
+      extraData: {
+        roomId: 'test-01586',
+        role: "leader",
+        userId: '066893f525e56f09ce8b4420dff7e0681',
+        nickname: "四维展主持人",
+        avatar: "https://4dkk.4dage.com/take-look/images/other/6d5298a02bd849119b7e5357cbd6edff.jpeg"
+      },
+      envVersion: 'develop',
+      success(res) {
+        // 打开成功
+      }
+    })
+  },
+  openCustomer() {
+    wx.navigateToMiniProgram({
+      appId: 'wxd55ee54235e90359',
+      path: 'pages/paid-room/paid-room',
+      extraData: {
+        roomId: 'test-01586',
+        userId: 'xxxx121212',
+        role: "customer",
+        nickname: "四维展客人",
+        avatar: "https://4dkk.4dage.com/take-look/images/other/6d5298a02bd849119b7e5357cbd6edff.jpeg"
+      },
+      envVersion: 'develop',
+      success(res) {
+        // 打开成功
+      }
+    })
+  },
+  handleVRDetail(item) {
+    console.log('item', item)
+    wx.navigateTo({
+      url: "/pages/course_detail/course_detail",
+    })
+  }
+})

+ 3 - 0
pages/course/course.json

@@ -0,0 +1,3 @@
+{
+  "usingComponents": {}
+}

+ 39 - 0
pages/course/course.wxml

@@ -0,0 +1,39 @@
+<!--pages/course/course.wxml-->
+<view class="container">
+
+  <!-- <button bindtap='openHost'>leader</button>
+<button bindtap='openCustomer'>customer</button> -->
+  <view class="search_con">
+    <view class="search">
+      <view class='icon'>
+        <view class='iconfont iconsousuo'></view>
+      </view>
+      <input placeholder="搜索博物馆、展览" />
+    </view>
+  </view>
+
+  <view class="list">
+    <view class="item" wx:for="{{testData}}" wx:key="index" bindtap="handleVRDetail">
+      <image class="cover" mode="scaleToFill"
+        src="https://ossxiaoan.4dage.com/720yun_fd_manage/fd720_FARRQblYc/vtour/panos/fd720_FARRQblYc.tiles/thumb.jpg">
+      </image>
+      <view class="title" wx:if="{{index %2 ===0}}">灵隐飞来峰-大门票{{index}}</view>
+      <view class="title" wx:else>湖北省博物馆金牌讲师2H真人深度讲解含无线耳麦</view>
+      <div class="sub_cotnainer">
+        <text class="sub_title" wx:if="{{index %2 ===0}}">余老师带你飞-</text>
+        <text class="sub_title" wx:else> 陈老师深入挖掘故宫的陈老师深入挖掘故宫的陈老师深入挖掘故宫的</text>
+
+        <view class="sub_time">
+          <image class="time" src="../../imgs/time.png"></image>
+          <text>45分钟</text>
+        </view>
+
+      </div>
+      <view class="price">
+        9.05元
+      </view>
+    </view>
+
+  </view>
+
+</view>

+ 119 - 0
pages/course/course.wxss

@@ -0,0 +1,119 @@
+/* pages/course/course.wxss */
+.container {
+  padding: 0;
+}
+
+.search_con {
+  width: 750rpx;
+  height: 104rpx;
+}
+
+.container .search {
+  margin: 0 auto;
+  position: relative;
+  display: flex;
+  flex-direction: row;
+  align-items: center;
+  width: 686rpx;
+  height: 72rpx;
+  background: #FFFFFF;
+  border-radius: 16rpx 16rpx 16rpx 16rpx;
+  border: 2rpx solid #888888;
+  font-size: 24rpx;
+}
+
+
+
+.container .search .icon {
+  position: relative;
+  flex: 0 0 68rpx;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+}
+
+.container .search input {
+  flex: 1;
+  height: 72rpx;
+}
+
+.list {
+  display: flex;
+  flex-direction: row;
+  flex-wrap: wrap;
+  justify-content: center;
+  gap: 30rpx;
+  padding-bottom: 50rpx;
+}
+
+.cover {
+  width: 330rpx;
+  height: 186rpx;
+  border-radius: 8rpx 8rpx 8rpx 8rpx;
+}
+
+.title {
+  line-height: 40rpx;
+  font-size: 28rpx;
+  max-width: 330rpx;
+  word-break: break-all;
+}
+
+.sub_cotnainer {
+  color: rgba(136, 136, 136, 1);
+  font-size: 20rpx;
+  line-height: 23rpx;
+  display: flex;
+  flex-direction: row;
+  flex-wrap: nowrap;
+}
+
+.sub_cotnainer .sub_title {
+  height: 28rpx;
+  display: inline;
+  overflow: hidden;
+  line-height: 28rpx;
+  max-width: 228rpx;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+  overflow: hidden;
+}
+
+.sub_cotnainer .sub_time {
+  display: flex;
+  height: 28rpx;
+  line-height: 28rpx;
+  align-items: center;
+  justify-content: center;
+  position: relative;
+  margin-left: 5rpx;
+}
+
+.sub_cotnainer .sub_time::before {
+  content: ' ';
+  width: 0.5rpx;
+  height: 12rpx;
+  background: #888888;
+  position: absolute;
+  top: 50%;
+  transform: translateY(-40%);
+  left: 0;
+}
+
+.sub_cotnainer .sub_time .time {
+  width: 16rpx;
+  height: 16rpx;
+  display: block;
+  padding: 2rpx 5rpx 0 8rpx;
+}
+
+.price {
+  height: 40rpx;
+  font-weight: 500;
+  font-size: 28rpx;
+  color: #FF6C6C;
+  line-height: 40rpx;
+  text-align: left;
+  font-style: normal;
+  text-transform: none;
+}

+ 83 - 0
pages/course_detail/course_detail.js

@@ -0,0 +1,83 @@
+// pages/course_detail/course_detail.js
+Page({
+
+  /**
+   * 页面的初始数据
+   */
+  data: {
+    time: 96 * 60 * 1000,
+  },
+
+  /**
+   * 生命周期函数--监听页面加载
+   */
+  onLoad(options) {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面初次渲染完成
+   */
+  onReady() {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面显示
+   */
+  onShow() {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面隐藏
+   */
+  onHide() {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面卸载
+   */
+  onUnload() {
+
+  },
+
+  /**
+   * 页面相关事件处理函数--监听用户下拉动作
+   */
+  onPullDownRefresh() {
+
+  },
+
+  /**
+   * 页面上拉触底事件的处理函数
+   */
+  onReachBottom() {
+
+  },
+
+  /**
+   * 用户点击右上角分享
+   */
+  onShareAppMessage() {
+
+  },
+  openHost() {
+    wx.navigateToMiniProgram({
+      appId: 'wxd55ee54235e90359',
+      path: 'pages/paid-room/paid-room',
+      extraData: {
+        roomId: 'test-01586',
+        role: "leader",
+        userId: '066893f525e56f09ce8b4420dff7e0681',
+        nickname: "四维展主持人",
+        avatar: "https://4dkk.4dage.com/take-look/images/other/6d5298a02bd849119b7e5357cbd6edff.jpeg"
+      },
+      envVersion: 'develop',
+      success(res) {
+        // 打开成功
+      }
+    })
+  },
+})

+ 8 - 0
pages/course_detail/course_detail.json

@@ -0,0 +1,8 @@
+{
+  "usingComponents": {
+    "t-count-down": "tdesign-miniprogram/count-down/count-down",
+    "t-button": "tdesign-miniprogram/button/button",
+    "t-image": "tdesign-miniprogram/image/image",
+    "t-loading": "tdesign-miniprogram/loading/loading"
+  }
+}

Файловите разлики са ограничени, защото са твърде много
+ 52 - 0
pages/course_detail/course_detail.wxml


+ 181 - 0
pages/course_detail/course_detail.wxss

@@ -0,0 +1,181 @@
+/* pages/course_detail/course_detail.wxss */
+
+.detail-container {
+  position: relative;
+}
+
+.banner {
+  width: 750rpx;
+  height: 470rpx;
+  position: absolute;
+  top: 0;
+  left: 0;
+}
+
+.detail-content {
+  margin-top: 450rpx;
+  border-radius: 20rpx;
+  background: #F5F5F5;
+  height: calc(100vh - 470rpx);
+  position: relative;
+  padding: 20rpx;
+
+}
+
+.title-info {
+  width: 670rpx;
+  height: 216rpx;
+  background: #fff;
+  margin: 0 auto;
+  border-radius: 16rpx 16rpx 16rpx 16rpx;
+  padding: 20rpx;
+  display: flex;
+  flex-direction: column;
+
+}
+
+.hugo_price {
+  font-weight: 600;
+  font-size: 40rpx;
+  color: #FF6C6C;
+  line-height: 47rpx;
+  height: 56rpx;
+
+}
+
+.hugo_title {
+  max-height: 88rpx;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  display: -webkit-box;
+  -webkit-box-orient: vertical;
+  -webkit-line-clamp: 2;
+  font-size: 32rpx;
+  line-height: 38rpx;
+  margin-bottom: 16rpx;
+
+}
+
+.sub_cotnainer {
+  color: rgba(136, 136, 136, 1);
+  font-size: 24rpx;
+  flex: 1;
+  display: flex;
+  flex-direction: row;
+  flex-wrap: nowrap;
+  justify-content: center;
+  align-items: center;
+  justify-content: space-between;
+  border-top: 0.5rpx #F5F5F5 solid;
+
+}
+
+.sub_cotnainer .sub_title {
+  height: 28rpx;
+  display: inline;
+  overflow: hidden;
+  line-height: 28rpx;
+  max-width: 228rpx;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+  overflow: hidden;
+}
+
+.sub_cotnainer .sub_time {
+  display: flex;
+  height: 28rpx;
+  line-height: 28rpx;
+  align-items: center;
+  justify-content: center;
+  position: relative;
+  margin-left: 5rpx;
+}
+
+.sub_cotnainer .sub_time .time {
+  width: 20rpx;
+  height: 20rpx;
+  display: block;
+  padding: 2rpx 5rpx 0 8rpx;
+}
+
+.detail_content {
+  margin: 0 auto;
+  margin-top: 20rpx;
+  border-radius: 16rpx 16rpx 16rpx 16rpx;
+  background: #fff;
+  padding: 20rpx;
+  font-weight: 400;
+  font-size: 26rpx;
+  color: #333333;
+  line-height: 30rpx;
+  text-align: left;
+  font-style: normal;
+  text-transform: none;
+  /* min-height: 100vh; */
+
+}
+
+.detail_title {
+  height: 40rpx;
+  font-weight: 500;
+  font-size: 28rpx;
+  padding: 20rpx 0;
+  color: #333333;
+  line-height: 33rpx;
+  text-align: left;
+  font-style: normal;
+  text-transform: none;
+}
+
+.bottom_panel {
+  position: fixed;
+  height: 100rpx;
+  bottom: 0;
+  width: 100%;
+  background: #fff;
+  /* 可以通过增加padding-bottom来适配 */
+  padding-bottom: constant(safe-area-inset-bottom);
+  /*兼容 IOS<11.2*/
+  padding-bottom: env(safe-area-inset-bottom);
+  /*兼容 IOS>11.2*/
+  display: flex;
+  flex-direction: row;
+  justify-content: space-between;
+  align-items: center;
+}
+
+.bottom_panel .left {
+  margin-left: 32rpx;
+  display: flex;
+  height: 72rpx;
+  text-align: left;
+  flex-direction: column;
+}
+
+.bottom_panel .left .count {
+  --td-countdown-bg-color: #404040;
+  --td-countdown-default-color: #404040;
+  --td-error-color-6: #404040;
+  --td-font-size-s: 20rpx;
+  /* padding-left: 5rpx; */
+
+}
+
+.bottom_panel .left .desc {
+  width: 422rpx;
+  height: 34rpx;
+  font-weight: 400;
+  font-size: 24rpx;
+  color: #333333;
+  line-height: 28rpx;
+  text-transform: none;
+}
+
+
+.bottom_panel .right .btn {
+  --td-button-default-bg-color: #D75F5D;
+  font-size: 28rpx;
+  width: 220rpx;
+  height: 72rpx;
+  margin-right: 20rpx;
+}

+ 3 - 3
pages/tongcheng/index.json

@@ -1,7 +1,7 @@
 {
   "usingComponents": {
-    "component-search": "/common/components/component-search/component-search",
-    "drop-down": "/common/components/drop-down/index",
-    "component-list": "../../../common/components/component-list/component-list"
+    "component-search": "../../common/components/component-search/component-search",
+    "drop-down": "../../common/components/drop-down/index",
+    "component-list": "../../common/components/component-list/component-list"
   }
 } 

+ 66 - 0
pages/user/info/info.js

@@ -0,0 +1,66 @@
+// pages/user/info/info.js
+Page({
+
+  /**
+   * 页面的初始数据
+   */
+  data: {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面加载
+   */
+  onLoad(options) {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面初次渲染完成
+   */
+  onReady() {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面显示
+   */
+  onShow() {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面隐藏
+   */
+  onHide() {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面卸载
+   */
+  onUnload() {
+
+  },
+
+  /**
+   * 页面相关事件处理函数--监听用户下拉动作
+   */
+  onPullDownRefresh() {
+
+  },
+
+  /**
+   * 页面上拉触底事件的处理函数
+   */
+  onReachBottom() {
+
+  },
+
+  /**
+   * 用户点击右上角分享
+   */
+  onShareAppMessage() {
+
+  }
+})

+ 3 - 0
pages/user/info/info.json

@@ -0,0 +1,3 @@
+{
+  "usingComponents": {}
+}

+ 2 - 0
pages/user/info/info.wxml

@@ -0,0 +1,2 @@
+<!--pages/user/info/info.wxml-->
+<text>pages/user/info/info.wxml</text>

+ 1 - 0
pages/user/info/info.wxss

@@ -0,0 +1 @@
+/* pages/user/info/info.wxss */

+ 34 - 35
pages/yuezhan/index.js

@@ -37,17 +37,17 @@ Page({
     tag: 0,
     latitude: null,
     longitude: null,
-    showRecommend:false
+    showRecommend: false
   },
 
-  onLoad: function() {
+  onLoad: function () {
     this.setData({
       serverName,
       defaultImg,
       noExhibitionImg,
       imgServer,
       closeImg,
-      showRecommend:true
+      showRecommend: true
       // isLogin
     })
 
@@ -56,7 +56,7 @@ Page({
     wx.hideTabBar()
   },
 
-  loadMore: function() {
+  loadMore: function () {
     if (!this.data.lastPage) {
       console.log(this.data.currentPage + 1)
       this.getList(this.data.currentPage + 1);
@@ -65,14 +65,14 @@ Page({
     }
   },
 
-  onReachBottom: function() {
+  onReachBottom: function () {
     if (!this.data.loading) {
       this.loadMore();
       console.log('reach Bottom');
     }
   },
 
-  onShow: function() {
+  onShow: function () {
     let {
       collectedArr,
       collectedChange
@@ -112,7 +112,7 @@ Page({
     app.globalData.collectedChange = false;
 
   },
-  onPullDownRefresh: function() {
+  onPullDownRefresh: function () {
     this.setData({
       exhibitionList: [],
       currentPage: 1
@@ -121,14 +121,14 @@ Page({
     this.getList(1);
   },
 
-  hideRecommend:function(){
+  hideRecommend: function () {
     this.setData({
-      showRecommend:false
+      showRecommend: false
     })
     wx.showTabBar()
   },
 
-  fetchData: function (page){
+  fetchData: function (page) {
     request["getExhibitionList"]({
       page: page,
       type: 0,
@@ -137,8 +137,7 @@ Page({
     }, '', res => {
 
       let tempContent = this.data.exhibitionList ?
-        this.data.exhibitionList :
-        [];
+        this.data.exhibitionList : [];
       let {
         last: lastPage,
         totalPages,
@@ -151,7 +150,7 @@ Page({
       console.log(res)
       exhibitionList.forEach((currentValue) => {
         currentValue.distance = Math.ceil(currentValue.distance);
-        if (currentValue.product){
+        if (currentValue.product) {
           currentValue.product.link = escape(currentValue.product.link);
           currentValue.product.imageUrl = escape(currentValue.product.imageUrl);
         }
@@ -173,12 +172,12 @@ Page({
   },
 
 
-  getList: function(page) {
+  getList: function (page) {
     let type = this.data.tag;
     this.setData({
       loading: true
     })
-    if (this.data.latitude||this.data.longitude) {
+    if (this.data.latitude || this.data.longitude) {
       this.fetchData(page)
     } else {
       wx.getLocation({
@@ -197,7 +196,7 @@ Page({
     }
   },
 
-  getBanner: function() {
+  getBanner: function () {
     request["getBannerList"]({}, '', res => {
       let {
         content: commodityImgs
@@ -214,7 +213,7 @@ Page({
     })
   },
 
-  addLike: function(e) {
+  addLike: function (e) {
     let {
       type,
       id,
@@ -282,7 +281,7 @@ Page({
     console.log(this.data.exhibitionList)
   },
 
-  tabClick: function(e) {
+  tabClick: function (e) {
     // console.log(e.currentTarget.dataset)
 
     // if (e.currentTarget.id == 1) {
@@ -304,12 +303,12 @@ Page({
     this.getList(1);
     // }
   },
-  onShareAppMessage: function() {
+  onShareAppMessage: function () {
 
   },
 
 
-  to_pay: function(e) {
+  to_pay: function (e) {
     // console.log('dwdwdw', e.currentTarget.dataset)
 
     let {
@@ -335,9 +334,9 @@ Page({
       case 0:
         wx.navigateTo({
           url: `../wv_page/index`,
-          success: function(res) {},
-          fail: function(res) {},
-          complete: function(res) {},
+          success: function (res) {},
+          fail: function (res) {},
+          complete: function (res) {},
         })
         break;
       case 1:
@@ -345,25 +344,25 @@ Page({
           case 0:
             wx.navigateTo({
               url: `../cg_detail/index?id=${url}`,
-              success: function(res) {},
-              fail: function(res) {},
-              complete: function(res) {},
+              success: function (res) {},
+              fail: function (res) {},
+              complete: function (res) {},
             })
             break;
           case 1:
             if (hasproduct) {
               wx.navigateTo({
                 url: `../wv_page/index?&id=${url}`,
-                success: function(res) {},
-                fail: function(res) {},
-                complete: function(res) {},
+                success: function (res) {},
+                fail: function (res) {},
+                complete: function (res) {},
               })
             } else {
               wx.navigateTo({
                 url: `../zl_detail/index?id=${url}`,
-                success: function(res) {},
-                fail: function(res) {},
-                complete: function(res) {},
+                success: function (res) {},
+                fail: function (res) {},
+                complete: function (res) {},
               })
             }
 
@@ -376,9 +375,9 @@ Page({
         app.globalData.bannerHtml = description;
         wx.navigateTo({
           url: `./html_detail/index?id=${id}&imageUrl=${imageurl}&relayUrl=${relayUrl||''}`,
-          success: function (res) { },
-          fail: function (res) { },
-          complete: function (res) { },
+          success: function (res) {},
+          fail: function (res) {},
+          complete: function (res) {},
         })
         break;
       default:

+ 141 - 141
project.config.json

@@ -1,142 +1,142 @@
-{
-  "description": "项目配置文件。",
-  "setting": {
-    "urlCheck": true,
-    "es6": true,
-    "postcss": true,
-    "minified": true,
-    "newFeature": true,
-    "nodeModules": false,
-    "autoAudits": false,
-    "checkInvalidKey": true,
-    "checkSiteMap": true,
-    "uploadWithSourceMap": true,
-    "babelSetting": {
-      "ignore": [],
-      "disablePlugins": [],
-      "outputPath": ""
-    },
-    "useCompilerModule": false,
-    "userConfirmedUseCompilerModuleSwitch": false,
-    "useMultiFrameRuntime": true,
-    "useApiHook": true,
-    "useApiHostProcess": true,
-    "packNpmRelationList": []
-  },
-  "compileType": "miniprogram",
-  "libVersion": "2.11.3",
-  "appid": "wx0e75c90d9db2047b",
-  "projectname": "Small_Program",
-  "simulatorType": "wechat",
-  "simulatorPluginLibVersion": {},
-  "condition": {
-    "miniprogram": {
-      "list": [
-        {
-          "name": "test",
-          "pathName": "pages/wv_page/index",
-          "query": "link=https%3A//admin.4dmuseum.cn/showApp.html%3Fm%3D584%26bigScene&id=7152&imageUrl=https://4dkanzhan.4dkankan.com/exhibition/22742475-b1cc-4705-b4a6-84d52231db34.jpg",
-          "scene": 1036,
-          "referrerInfo": {}
-        },
-        {
-          "name": "reward-detail",
-          "pathName": "pages/user/my_follow/index",
-          "query": "",
-          "scene": null
-        },
-        {
-          "name": "detail",
-          "pathName": "pages/zl_detail/index",
-          "query": "id=5623",
-          "scene": null
-        },
-        {
-          "name": "result",
-          "pathName": "pages/yuezhan/search_result/index",
-          "query": ""
-        },
-        {
-          "name": "rewas",
-          "pathName": "pages/zl_detail/create_evaluation/index",
-          "query": "",
-          "scene": null
-        },
-        {
-          "name": "test",
-          "pathName": "pages/zl_detail/index",
-          "query": "id=6857&imageUrl=https://4dkanzhan.4dkankan.com/exhibition/ea667eb9-8552-4a91-b998-7175112887dc.png",
-          "scene": null
-        },
-        {
-          "name": "线下看展",
-          "pathName": "pages/zl_detail/index",
-          "query": "id=6158",
-          "scene": null
-        },
-        {
-          "name": "我的收藏",
-          "pathName": "pages/user/my_follow/index",
-          "query": "",
-          "scene": null
-        },
-        {
-          "name": "我的足迹",
-          "pathName": "pages/user/my_saw/index",
-          "query": "",
-          "scene": null
-        },
-        {
-          "name": "我的评论",
-          "pathName": "pages/user/my_comment/index",
-          "query": "",
-          "scene": null
-        },
-        {
-          "name": "联系我们",
-          "pathName": "pages/user/my_contact/index",
-          "query": "",
-          "scene": null
-        },
-        {
-          "name": "博物馆信息",
-          "pathName": "pages/cg_detail/index",
-          "query": "id=14122",
-          "scene": null
-        },
-        {
-          "name": "大场景",
-          "pathName": "pages/wv_page/index",
-          "query": "link=https%3A//4dscene.4dage.com/playcanvas/museum/shuangerxijinping/index.html&id=25&imageUrl=https://4dkanzhan.4dkankan.com/exhibition/6b193567-c89b-403b-a117-b2f1fe9bd830.jpg",
-          "scene": null
-        },
-        {
-          "name": "test",
-          "pathName": "pages/wv_page/index",
-          "query": "link=https%3A//www.cgaii.com/museum/cultural/index.html&id=25&imageUrl=https://4dkanzhan.4dkankan.com/exhibition/6b193567-c89b-403b-a117-b2f1fe9bd830.jpg",
-          "scene": 1091
-        },
-        {
-          "name": "shouye",
-          "pathName": "pages/wv_page/index",
-          "query": "scene=7411",
-          "scene": null
-        },
-        {
-          "name": "pages/wv_page/index",
-          "pathName": "pages/wv_page/index",
-          "query": "id=25",
-          "scene": null
-        }
-      ]
-    }
-  },
-  "packOptions": {
-    "ignore": [],
-    "include": []
-  },
-  "editorSetting": {
-    "tabIndent": "insertSpaces",
-    "tabSize": 2
-  }
+{
+  "description": "项目配置文件。",
+  "setting": {
+    "urlCheck": true,
+    "es6": true,
+    "postcss": true,
+    "minified": true,
+    "newFeature": true,
+    "nodeModules": false,
+    "autoAudits": false,
+    "checkInvalidKey": true,
+    "checkSiteMap": true,
+    "uploadWithSourceMap": true,
+    "babelSetting": {
+      "ignore": [],
+      "disablePlugins": [],
+      "outputPath": ""
+    },
+    "useCompilerModule": false,
+    "userConfirmedUseCompilerModuleSwitch": false,
+    "useMultiFrameRuntime": true,
+    "useApiHook": true,
+    "useApiHostProcess": true,
+    "packNpmRelationList": []
+  },
+  "compileType": "miniprogram",
+  "libVersion": "2.11.3",
+  "appid": "wx0e75c90d9db2047b",
+  "projectname": "Small_Program",
+  "simulatorType": "wechat",
+  "simulatorPluginLibVersion": {},
+  "condition": {
+    "miniprogram": {
+      "list": [
+        {
+          "name": "test",
+          "pathName": "pages/wv_page/index",
+          "query": "link=https%3A//admin.4dmuseum.cn/showApp.html%3Fm%3D584%26bigScene&id=7152&imageUrl=https://4dkanzhan.4dkankan.com/exhibition/22742475-b1cc-4705-b4a6-84d52231db34.jpg",
+          "scene": 1036,
+          "referrerInfo": {}
+        },
+        {
+          "name": "reward-detail",
+          "pathName": "pages/user/my_follow/index",
+          "query": "",
+          "scene": null
+        },
+        {
+          "name": "detail",
+          "pathName": "pages/zl_detail/index",
+          "query": "id=5623",
+          "scene": null
+        },
+        {
+          "name": "result",
+          "pathName": "pages/yuezhan/search_result/index",
+          "query": ""
+        },
+        {
+          "name": "rewas",
+          "pathName": "pages/zl_detail/create_evaluation/index",
+          "query": "",
+          "scene": null
+        },
+        {
+          "name": "test",
+          "pathName": "pages/zl_detail/index",
+          "query": "id=6857&imageUrl=https://4dkanzhan.4dkankan.com/exhibition/ea667eb9-8552-4a91-b998-7175112887dc.png",
+          "scene": null
+        },
+        {
+          "name": "线下看展",
+          "pathName": "pages/zl_detail/index",
+          "query": "id=6158",
+          "scene": null
+        },
+        {
+          "name": "我的收藏",
+          "pathName": "pages/user/my_follow/index",
+          "query": "",
+          "scene": null
+        },
+        {
+          "name": "我的足迹",
+          "pathName": "pages/user/my_saw/index",
+          "query": "",
+          "scene": null
+        },
+        {
+          "name": "我的评论",
+          "pathName": "pages/user/my_comment/index",
+          "query": "",
+          "scene": null
+        },
+        {
+          "name": "联系我们",
+          "pathName": "pages/user/my_contact/index",
+          "query": "",
+          "scene": null
+        },
+        {
+          "name": "博物馆信息",
+          "pathName": "pages/cg_detail/index",
+          "query": "id=14122",
+          "scene": null
+        },
+        {
+          "name": "大场景",
+          "pathName": "pages/wv_page/index",
+          "query": "link=https%3A//4dscene.4dage.com/playcanvas/museum/shuangerxijinping/index.html&id=25&imageUrl=https://4dkanzhan.4dkankan.com/exhibition/6b193567-c89b-403b-a117-b2f1fe9bd830.jpg",
+          "scene": null
+        },
+        {
+          "name": "test",
+          "pathName": "pages/wv_page/index",
+          "query": "link=https%3A//www.cgaii.com/museum/cultural/index.html&id=25&imageUrl=https://4dkanzhan.4dkankan.com/exhibition/6b193567-c89b-403b-a117-b2f1fe9bd830.jpg",
+          "scene": 1091
+        },
+        {
+          "name": "shouye",
+          "pathName": "pages/wv_page/index",
+          "query": "scene=7411",
+          "scene": null
+        },
+        {
+          "name": "pages/wv_page/index",
+          "pathName": "pages/wv_page/index",
+          "query": "id=25",
+          "scene": null
+        }
+      ]
+    }
+  },
+  "packOptions": {
+    "ignore": [],
+    "include": []
+  },
+  "editorSetting": {
+    "tabIndent": "insertSpaces",
+    "tabSize": 2
+  }
 }

+ 110 - 110
project.private.config.json

@@ -1,111 +1,111 @@
-{
-  "description": "项目私有配置文件。此文件中的内容将覆盖 project.config.json 中的相同字段。项目的改动优先同步到此文件中。详见文档:https://developers.weixin.qq.com/miniprogram/dev/devtools/projectconfig.html",
-  "condition": {
-    "miniprogram": {
-      "list": [
-        {
-          "name": "test",
-          "pathName": "pages/yuezhan/pay_page/index",
-          "query": "id=7532",
-          "launchMode": "default",
-          "scene": 1000
-        },
-        {
-          "name": "reward-detail",
-          "pathName": "pages/user/my_follow/index",
-          "query": "",
-          "scene": null
-        },
-        {
-          "name": "detail",
-          "pathName": "pages/zl_detail/index",
-          "query": "id=5623",
-          "scene": null
-        },
-        {
-          "name": "result",
-          "pathName": "pages/yuezhan/search_result/index",
-          "query": ""
-        },
-        {
-          "name": "rewas",
-          "pathName": "pages/zl_detail/create_evaluation/index",
-          "query": "",
-          "scene": null
-        },
-        {
-          "name": "test",
-          "pathName": "pages/zl_detail/index",
-          "query": "id=6857&imageUrl=https://4dkanzhan.4dkankan.com/exhibition/ea667eb9-8552-4a91-b998-7175112887dc.png",
-          "scene": null
-        },
-        {
-          "name": "线下看展",
-          "pathName": "pages/zl_detail/index",
-          "query": "id=6158",
-          "scene": null
-        },
-        {
-          "name": "我的收藏",
-          "pathName": "pages/user/my_follow/index",
-          "query": "",
-          "scene": null
-        },
-        {
-          "name": "我的足迹",
-          "pathName": "pages/user/my_saw/index",
-          "query": "",
-          "scene": null
-        },
-        {
-          "name": "我的评论",
-          "pathName": "pages/user/my_comment/index",
-          "query": "",
-          "scene": null
-        },
-        {
-          "name": "联系我们",
-          "pathName": "pages/user/my_contact/index",
-          "query": "",
-          "scene": null
-        },
-        {
-          "name": "博物馆信息",
-          "pathName": "pages/cg_detail/index",
-          "query": "id=14122",
-          "scene": null
-        },
-        {
-          "name": "大场景",
-          "pathName": "pages/wv_page/index",
-          "query": "link=https%3A//4dscene.4dage.com/playcanvas/museum/shuangerxijinping/index.html&id=25&imageUrl=https://4dkanzhan.4dkankan.com/exhibition/6b193567-c89b-403b-a117-b2f1fe9bd830.jpg",
-          "scene": null
-        },
-        {
-          "name": "test",
-          "pathName": "pages/wv_page/index",
-          "query": "link=https%3A//www.cgaii.com/museum/cultural/index.html&id=25&imageUrl=https://4dkanzhan.4dkankan.com/exhibition/6b193567-c89b-403b-a117-b2f1fe9bd830.jpg",
-          "scene": 1091
-        },
-        {
-          "name": "shouye",
-          "pathName": "pages/wv_page/index",
-          "query": "scene=7411",
-          "scene": null
-        },
-        {
-          "name": "pages/wv_page/index",
-          "pathName": "pages/wv_page/index",
-          "query": "id=25",
-          "scene": null
-        }
-      ]
-    }
-  },
-  "projectname": "Small_Program",
-  "setting": {
-    "compileHotReLoad": true,
-    "urlCheck": false
-  },
-  "libVersion": "2.14.1"
+{
+  "description": "项目私有配置文件。此文件中的内容将覆盖 project.config.json 中的相同字段。项目的改动优先同步到此文件中。详见文档:https://developers.weixin.qq.com/miniprogram/dev/devtools/projectconfig.html",
+  "condition": {
+    "miniprogram": {
+      "list": [
+        {
+          "name": "test",
+          "pathName": "pages/yuezhan/pay_page/index",
+          "query": "id=7532",
+          "launchMode": "default",
+          "scene": 1000
+        },
+        {
+          "name": "reward-detail",
+          "pathName": "pages/user/my_follow/index",
+          "query": "",
+          "scene": null
+        },
+        {
+          "name": "detail",
+          "pathName": "pages/zl_detail/index",
+          "query": "id=5623",
+          "scene": null
+        },
+        {
+          "name": "result",
+          "pathName": "pages/yuezhan/search_result/index",
+          "query": ""
+        },
+        {
+          "name": "rewas",
+          "pathName": "pages/zl_detail/create_evaluation/index",
+          "query": "",
+          "scene": null
+        },
+        {
+          "name": "test",
+          "pathName": "pages/zl_detail/index",
+          "query": "id=6857&imageUrl=https://4dkanzhan.4dkankan.com/exhibition/ea667eb9-8552-4a91-b998-7175112887dc.png",
+          "scene": null
+        },
+        {
+          "name": "线下看展",
+          "pathName": "pages/zl_detail/index",
+          "query": "id=6158",
+          "scene": null
+        },
+        {
+          "name": "我的收藏",
+          "pathName": "pages/user/my_follow/index",
+          "query": "",
+          "scene": null
+        },
+        {
+          "name": "我的足迹",
+          "pathName": "pages/user/my_saw/index",
+          "query": "",
+          "scene": null
+        },
+        {
+          "name": "我的评论",
+          "pathName": "pages/user/my_comment/index",
+          "query": "",
+          "scene": null
+        },
+        {
+          "name": "联系我们",
+          "pathName": "pages/user/my_contact/index",
+          "query": "",
+          "scene": null
+        },
+        {
+          "name": "博物馆信息",
+          "pathName": "pages/cg_detail/index",
+          "query": "id=14122",
+          "scene": null
+        },
+        {
+          "name": "大场景",
+          "pathName": "pages/wv_page/index",
+          "query": "link=https%3A//4dscene.4dage.com/playcanvas/museum/shuangerxijinping/index.html&id=25&imageUrl=https://4dkanzhan.4dkankan.com/exhibition/6b193567-c89b-403b-a117-b2f1fe9bd830.jpg",
+          "scene": null
+        },
+        {
+          "name": "test",
+          "pathName": "pages/wv_page/index",
+          "query": "link=https%3A//www.cgaii.com/museum/cultural/index.html&id=25&imageUrl=https://4dkanzhan.4dkankan.com/exhibition/6b193567-c89b-403b-a117-b2f1fe9bd830.jpg",
+          "scene": 1091
+        },
+        {
+          "name": "shouye",
+          "pathName": "pages/wv_page/index",
+          "query": "scene=7411",
+          "scene": null
+        },
+        {
+          "name": "pages/wv_page/index",
+          "pathName": "pages/wv_page/index",
+          "query": "id=25",
+          "scene": null
+        }
+      ]
+    }
+  },
+  "projectname": "Small_Program",
+  "setting": {
+    "compileHotReLoad": true,
+    "urlCheck": false
+  },
+  "libVersion": "2.14.1"
 }