Merge branch 'feature/medou/mini-v1.1.0' of http://gogs.1hhd.com/1hjz-3N/1hjz-mini into feature/medou/mini-v1.1.0

* 'feature/medou/mini-v1.1.0' of http://gogs.1hhd.com/1hjz-3N/1hjz-mini:
  首页返回
  首页静态

pages/activity_detail/activity_detail.js

@@ -2,7 +2,6 @@
 const app = getApp()
 let interval
 var WxParse = require('../../wxParse/wxParse.js');//主要为了能够显示获取的html代码
-
 Page({
   /**
    * 页面的初始数据
@@ -28,14 +27,16 @@ Page({
     grounpInfo2: "none",
     one_content: "none",
     two_content: "none",
+    // two_content: "block",
     bottomBGColor: '#F36619',
-    buttomText: '我要开团',
+    buttomText: '我要拼团',
     tagColor: "#F8B551",
     remark: "none",
     remarkText: "已退款",
     //分享
     show: false,
     cancelWithMask: true,
+    img1: '/images/u273.png',
     actions: [{
       name: '微信好友',
       icon: '../../images/wechat_ico.png',
@@ -139,7 +140,7 @@ Page({
                   one_content: "block",
                   two_content: "none",
                   bottomBGColor: '#F36619',
-                  buttomText: '我要开团',
+                  buttomText: '我要拼团',
                   grounpInfo: "none",
                   grounpInfo2: "block",
 
@@ -165,7 +166,7 @@ Page({
                   one_content: "block",
                   two_content: "none",
                   bottomBGColor: '#F36619',
-                  buttomText: '我要开团',
+                  buttomText: '我要拼团',
                   grounpInfo: "none",
                   grounpInfo2: "block",
 
@@ -177,7 +178,7 @@ Page({
                   one_content: "block",
                   two_content: "none",
                   bottomBGColor: '#F36619',
-                  buttomText: '重新开团',
+                  buttomText: '重新拼团',
                   grounpInfo: "block",
                   grounpInfo2: "none",
                   remark: "none",
@@ -493,4 +494,9 @@ Page({
       path: '/pages/activity_detail/activity_detail?activityNo=' + this.data.activityNo + '&groupNo=' + this.data.groupNo,
     };
   },
+  openGroup: function (e) {
+    wx.switchTab({
+      url: '../index/index'
+    })
+  },
 })

pages/activity_detail/activity_detail.wxml

@@ -6,8 +6,8 @@
       <view class='row0'>
         <text class='title'>{{activityDetail.activityName}}</text>
         <view class='countdown' style='display: {{groupNo == "" ? "block" : "none"}};'>
-          <text >{{activityDetail.countdownDesc}}</text>
-          <view >
+          <text>{{activityDetail.countdownDesc}}</text>
+          <view>
             <text class="sec">{{countDownDay}}</text>天
             <text class="sec">{{countDownHour}}</text>时
             <text class="sec">{{countDownMinute}}</text>分
@@ -62,6 +62,7 @@
               <text class="{{item.memberType == 0 ? 'markBlock' : 'markNone'}}">团长</text>
             </view>
           </view>
+
         </scroll-view>
       </view>
     </view>
@@ -77,15 +78,24 @@
       <template is="wxParse" data="{{wxParseData:activityContent.nodes}}" />
     </view>
   </scroll-view>
-  <view class='bottom_view'> 
-<!-- 我要开团按钮 -->
-    <view class='one_content' id='one_button' style='display: {{one_content}};background-color:{{bottomBGColor}};' bindtap='groupTap'>{{buttomText}}</view> 
+
+  <view class='bottom_view'>
+    <view class="buttom_img" bindtap='openGroup'>
+      <view class="buttom_imgs_top">
+        <image src='{{img1}}' class="imgs"></image>
+      </view>
+      <view class="buttom_imgs_buttom">
+        <text class="imgs_text">首页</text>
+      </view>
+    </view>
+    <!-- 我要开团按钮 -->
+    <view class='one_content' id='one_button' style='display: {{one_content}};background-color:{{bottomBGColor}};' bindtap='groupTap'>{{buttomText}}</view>
     <view class='two_content' id='two_content' style='display: {{two_content}};'>
-    <!-- 参与拼团的成员---左边价格，右边参与拼团 -->
+      <!-- 参与拼团的成员---左边价格，右边参与拼团 -->
       <view class='left'>￥{{activityDetail.participantPrice / 100}}</view>
       <view class='right' bindtap='groupTap'>{{buttomText}}</view>
     </view>
   </view>
 </view>
 <!--底部弹出框-->
-<zan-actionsheet show="{{ show }}" actions="{{ actions }}" cancel-with-mask="{{ cancelWithMask }}" bind:cancel="closeActionSheet" bind:actionclick="clickAction" mask-class="tiny" />
+<zan-actionsheet show="{{ show }}" actions="{{ actions }}" cancel-with-mask="{{ cancelWithMask }}" bind:cancel="closeActionSheet" bind:actionclick="clickAction" mask-class="tiny" />0

pages/activity_detail/activity_detail.wxss

@@ -255,37 +255,75 @@ image{
   height: 50px;
   position:fixed; 
   bottom:0; 
+  background: #fff;
+
+}
+.buttom_img{
+   width:15%;
+  height: 50px;
+  position:fixed; 
+  bottom:0;
+  z-index: 999;
+  text-align: center;
+  border-right: 1px solid #ccc;
+}
+.buttom_img .buttom_imgs_top{
+  height: 22px;
+}
+.buttom_img  .buttom_imgs_buttom{
+margin-bottom: 3px;
+display: inline-block;
+}
+.buttom_img .imgs{
+width: 40rpx;
+height: 34rpx;
+display: inline-block;
+margin-top: 5px;
+}
+.buttom_img .imgs_text{
+  color:#333333;
+  font-size:15px;
+  padding-bottom: 5px;
+  
 }
 
 .bottom_view .one_content{
-   width:100%;
+   /* width:100%;
    line-height: 50px;
    color: white;
    text-align: center;
    font-size: 16px;
-   font-weight: bold;
+   font-weight: bold; */
+   width:85%;
+line-height:50px;
+color:white;
+text-align:center;
+font-size:16px;
+font-weight:bold;
+float:right;
+
 }
 
 
 .bottom_view .two_content{
-  width:100%;
-  line-height: 50px;
-  float: left;
+ width:85%;
+line-height:50px;
+float:right;
+
 }
 
 .bottom_view .two_content .left{
-  width: 35%;
+  width: 28%;
   line-height: 50px;
   font-size: 23px;
   color: #F44054;
   font-weight: bold;
-  margin-left: 0px;
   background-color: white;
   text-align: center;
   float: left;
 }
 .bottom_view .two_content .right{
-  width: 65%;
+  width: 72%;
   line-height: 50px;
   font-size: 16px;
   color: white;

pages/at_present/at_present.js

@@ -26,9 +26,6 @@ Page({
      // key: 'C5KBZ-RISKD-INW4P-PWYQJ-QC6C7-BQBGC'//测试
       key: 'JN7BZ-MJBK5-52SIH-QOKGH-FJE5F-IWFGG'//正式
     });
-    // this.setData({
-    //   groupNo: options.groupNo == undefined ? "" : options.groupNo,
-    // });
   },
   onReady: function() {
     var that = this;

pages/at_present/at_present.wxml

@@ -5,7 +5,6 @@
         <text bindtap='openGroups'>{{city}}{{district}}</text> 
     </view>
     <view class="base_hint {{showOrHidden?'hide':'show'}}">{{lists}}</view>
-    <!-- class="choice_switchover {{showOrHidden?'show':'hide'}}"  style='display: {{groupNo == "" ? "block" : "none"}};'-->
     <text class="choice_switchover {{showOrHidden?'hide':'show'}}" bindtap='openGroup' >手动切换地址</text>
     <view class="choice {{showOrHidden?'show':'hide'}}">
        <text class="confirm_left" bindtap='groupTaps'>确定</text> 

pages/index/index.wxml

@@ -32,7 +32,7 @@
         <view class='p2'>¥</view>{{item.participantPrice / 100}}
         <text class="del">原价:{{item.originalPrice / 100}}</text>
       </view>
-      <button class='openBtn' bindtap='openGroup' form-type="submit" data-item='{{item.activityNo}}' >去开团</button>
+      <button class='openBtn' bindtap='openGroup' form-type="submit" data-item='{{item.activityNo}}' >去拼团</button>
     </view>
   </view>
 </view>