UP

src/app.json

@@ -6,15 +6,22 @@
     "pages/myOrder/myOrder",
     "pages/repay/repay",
     "pages/creatOrder/creatOrder",
+    "pages/creatOrder1/creatOrder",
+    "pages/creatOrder2/creatOrder",    
     "pages/me/me",
     "pages/flashSale/index",
     "pages/menpiao/index",
+    "pages/jiudian/index",
     "pages/freeGo/index",
+    "pages/performance/index",
     "pages/huiTravel/index",
     "pages/travel/detail",
     "pages/reverse/index",
+    "pages/reverse1/index",    
     "pages/ditu/index",
     "pages/needKnow/needKnow",
+    "pages/needKnow1/needKnow",
+    "pages/needKnow2/needKnow",    
     "pages/selectOwner/selectOwner",
     "pages/selectOwner/editOwner"
   ],

src/app.wxss

@@ -228,6 +228,10 @@ flex-jcc {
   font-size: 22rpx;
 }
 
+.f23 {
+  font-size: 23rpx;
+}
+
 .f24 {
   font-size: 24rpx;
 }
@@ -666,3 +670,32 @@ button:after {
   z-index: -1;
 }
 
+.course-name {
+font-size: 30rpx;
+word-break: break-all;/*允许在单词内换行*/
+text-align: left;
+color: #323232;
+line-height: 45rpx;
+text-overflow: -o-ellipsis-lastline;/*css3中webkit内核提供的一个方法类似ellipsis*/
+overflow: hidden;
+text-overflow: ellipsis;
+display: -webkit-box;/*自适应盒子*/
+-webkit-line-clamp: 1;/*此处为1行,如果是两行就改成2*/
+-webkit-box-orient: vertical;
+}
+
+.course-name1 {
+font-size: 30rpx;
+word-break: break-all;/*允许在单词内换行*/
+text-align: left;
+color: #323232;
+line-height: 45rpx;
+text-overflow: -o-ellipsis-lastline;/*css3中webkit内核提供的一个方法类似ellipsis*/
+overflow: hidden;
+text-overflow: ellipsis;
+display: -webkit-box;/*自适应盒子*/
+-webkit-line-clamp:2;/*此处为1行,如果是两行就改成2*/
+-webkit-box-orient: vertical;
+}
+
+

src/common/backtotop/backtotop.js

@@ -0,0 +1,43 @@
+
+Component({
+  properties: {
+    // 属性值可以在组件使用时指定
+    floorstatus: {
+      type: Boolean,
+      value: false,
+      observer: function (newVal, oldVal, changedPath) {
+        // 属性被改变时执行的函数（可选）
+        this.setData({
+          floorstatus: newVal 
+        })
+      }
+    },
+  },
+  data: {
+    floorstatus: false
+  },
+  
+  ready: function () {
+   
+  },
+  detached: function () {
+    // 在组件实例被从页面节点树移除时执行
+  },
+  
+  methods: {
+    
+    //回到顶部
+    goTop: function (e) {  // 一键回到顶部
+      if (wx.pageScrollTo) {
+        wx.pageScrollTo({
+          scrollTop: 0
+        })
+      } else {
+        wx.showModal({
+          title: '提示',
+          content: '当前微信版本过低，无法使用该功能，请升级到最新微信版本后重试。'
+        })
+      }
+    }
+  }
+})

src/common/backtotop/backtotop.json

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

src/common/backtotop/backtotop.wxml

@@ -0,0 +1,6 @@
+
+<!--index.wxml-->
+<!--  -->
+<view class='goTop' hidden='{{!floorstatus}}' bindtap="goTop">
+  <image class="gtlogo" src='/img/btn_huidaodb@2x.png'></image>
+</view>

src/common/backtotop/backtotop.wxss

@@ -0,0 +1,13 @@
+.goTop{
+  width: 80rpx;
+  height: 80rpx;
+  border-radius: 50%;
+  position: fixed;
+  right: 30rpx;
+  bottom: 50rpx;
+  overflow: hidden;
+}
+.goTop .gtlogo{
+  width: 100%;
+  height: 100%;
+}

src/common/countdown/countdown.wxml

@@ -1,6 +1,6 @@
 <view class='flex f20 flex flex-aic' style='color:#FD7644'>
-  <view wx:if='{{!dayEmpty}}' class='flex mr10 flex-center cfff' style='border-radius:5rpx;width:32rpx;height:32rpx;background:#FD6A3C'>{{day}}</view><text wx:if='{{!dayEmpty}}' class="mr10">天</text>
-  <view class='flex mr10 flex-center cfff' style='border-radius:5rpx;width:32rpx;height:32rpx;background:#FD6A3C'>{{hour}}</view>:
-  <view class='flex ml10 mr10 flex-center cfff' style='border-radius:5rpx;width:32rpx;height:32rpx;background:#FD6A3C'>{{minute}}</view>:
-  <view class='flex ml10 mr10 flex-center cfff' style='border-radius:5rpx;width:32rpx;height:32rpx;background:#FD6A3C'>{{second}}</view>
+  <view wx:if='{{!dayEmpty}}' class='flex mr10 flex-center cfff' style='border-radius:5rpx;width:32rpx;height:32rpx;background:#FD6A3C'>{{day}}</view><text wx:if='{{!dayEmpty}}' class="mr8">天</text>
+  <view class='flex mr8 flex-center cfff' style='border-radius:5rpx;width:32rpx;height:32rpx;background:#FD6A3C'>{{hour}}</view>:
+  <view class='flex ml10 mr8 flex-center cfff' style='border-radius:5rpx;width:32rpx;height:32rpx;background:#FD6A3C'>{{minute}}</view>:
+  <view class='flex ml10 mr8 flex-center cfff' style='border-radius:5rpx;width:32rpx;height:32rpx;background:#FD6A3C'>{{second}}</view>
 </view>

src/common/countdown/countdown.wxss

@@ -7,6 +7,9 @@
 .flex-aic {
   align-items: center;
 }
+.mr8 {
+  margin-right: 8rpx;
+}
 .mr10 {
   margin-right: 10rpx;
 }

src/common/loading/loading.js

@@ -0,0 +1,21 @@
+import shuoAPI, { shuoAPIClient } from '../api/api.js'
+import shuoUser from '../user/user.js';
+Component({
+  properties: {
+    // 属性值可以在组件使用时指定
+    
+  },
+  data: {
+    isHidden: false
+  },
+  
+  ready: function () {
+   
+  },
+  detached: function () {
+    // 在组件实例被从页面节点树移除时执行
+  },
+  methods: {
+    
+  }
+})

src/common/loading/loading.json

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

src/common/loading/loading.wxml

@@ -0,0 +1,11 @@
+
+<!--index.wxml-->
+
+<view class="container">
+  <view class="sk-three-bounce">
+      <view class="sk-child sk-bounce1"></view>
+      <view class="sk-child sk-bounce2"></view>
+      <view class="sk-child sk-bounce3"></view>
+    </view>
+    
+</view>

src/common/loading/loading.wxss

@@ -0,0 +1,37 @@
+.sk-three-bounce {
+  margin: 10px auto;
+  width: 80px;
+  text-align: center; 
+}
+.sk-three-bounce .sk-child {
+    width: 15px;
+    height: 15px;
+    background: linear-gradient(#02cee4, #13dd98);
+    border-radius: 100%;
+    display: inline-block;
+    -webkit-animation: sk-three-bounce 1.4s ease-in-out 0s infinite both;
+    animation: sk-three-bounce 1.4s ease-in-out 0s infinite both;
+}
+.sk-three-bounce .sk-bounce1 {
+  -webkit-animation-delay: -0.32s;
+  animation-delay: -0.32s; 
+}
+  .sk-three-bounce .sk-bounce2 {
+    -webkit-animation-delay: -0.16s;
+            animation-delay: -0.16s; }
+
+@-webkit-keyframes sk-three-bounce {
+  0%, 80%, 100% {
+    -webkit-transform: scale(0);
+            transform: scale(0); }
+  40% {
+    -webkit-transform: scale(1);
+            transform: scale(1); } }
+
+@keyframes sk-three-bounce {
+  0%, 80%, 100% {
+    -webkit-transform: scale(0);
+            transform: scale(0); }
+  40% {
+    -webkit-transform: scale(1);
+            transform: scale(1); } }

src/config.js

@@ -1,14 +1,11 @@
-export default {
+export default {
   version: '1.0.0',
-  appName: '自我游-限时抢购',// 自我游,爱订不订
+  appName: '囡囡旅行',// 
   env: 'prod',
   publicPath: 'https://api3.zowoyoo.com',
-  downloadFile: 'https://yanshi.zowoyoo.com', // 预览或下载文件使用，暂时只拼团使用
-  ParentCustId: '84826',// 自我游15463,244727;爱订309845,331121;话语钱： 723081 ，测试：288037
-  appId: '101',// 小程序的编号
-  custId: '84826' //'451918 '
-  /* publicPath: 'https://dev.ziwoyou.cn',
-  ParentCustId: '288037',// 自我游15463,244727;爱订309845,331121;话语钱： 723081 ，测试：288037
-  appId: '101',// 小程序的编号
-  custId: '244727' // '451918 '  */
+  downloadFile: 'https://www.tuanmenpiao.com', // 
+  ParentCustId: '319597',// 
+  appId: '106',// 小程序的编号
+  custId: '319597' //
+  
 };