From acf89cec87cc5c62a05d5e235f81e14bba486d7b Mon Sep 17 00:00:00 2001
From: shuiqing <luoshuiqing@1hhd.com>
Date: Thu, 26 Jul 2018 13:44:26 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A6=96=E9=A1=B5=E9=9D=99=E6=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 images/u273.png                            | Bin 0 -> 403 bytes
 pages/activity_detail/activity_detail.js   |  15 ++++---
 pages/activity_detail/activity_detail.wxml |  22 ++++++++---
 pages/activity_detail/activity_detail.wxss |  44 +++++++++++++++++++--
 pages/at_present/at_present.js             |   3 --
 pages/at_present/at_present.wxml           |   1 -
 6 files changed, 67 insertions(+), 18 deletions(-)
 create mode 100644 images/u273.png

diff --git a/images/u273.png b/images/u273.png
new file mode 100644
index 0000000000000000000000000000000000000000..75274a1f68c4161497ecf426de29ff0a6b1d03a0
GIT binary patch
literal 403
zcmV;E0c`$>P)<h;3K|Lk000e1NJLTq000;O000&U1^@s6+I?Jz00001b5ch_0Itp)
z=>Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D0VqjCK~zXfwUob3
z!cY{4t1J!-4h{}%GC24MK7u0ygAc$%_%6gaFcStQqJx_bB$6;df}19UU;+t=lF0XK
zZ_TCLYAd&2^5y<Xdro?K?<oc8RIrC%*w=<nPH~9e*wn^<IW(h<g5TqLxZ0Cs0<Xcv
zff+?w@G(9{(_o1+e8&%b#b;dOuh=!u>jGPNjmNk{8K2Pga$cuc!!0`KdUzl2FvN9=
ze4uhQqN(2!+0L<|oBW9?(-oeeFOG1L<(R5Xw4>=3XQ*c{P{CY0nDGbKas8`RsKl!I
z1nu|a3U^2*$=ZvQ$aNx}*h%s<J6*Kom!zU3U95+z?A%}+{7oCasbZX<Q^ZA6bBr07
x(L3>fxC~bXpadgLit0t;){KSlf}Fx2*Z_Fhjl53v-$4KX002ovPDHLkV1nTvt>gdz

literal 0
HcmV?d00001

diff --git a/pages/activity_detail/activity_detail.js b/pages/activity_detail/activity_detail.js
index 3611708..1ee3951 100644
--- a/pages/activity_detail/activity_detail.js
+++ b/pages/activity_detail/activity_detail.js
@@ -2,7 +2,6 @@
 const app = getApp()
 let interval
 var WxParse = require('../../wxParse/wxParse.js');//主要为了能够显示获取的html代码
-
 Page({
   /**
    * 页面的初始数据
@@ -29,13 +28,14 @@ Page({
     one_content: "none",
     two_content: "none",
     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 +139,7 @@ Page({
                   one_content: "block",
                   two_content: "none",
                   bottomBGColor: '#F36619',
-                  buttomText: '我要开团',
+                  buttomText: '我要拼团',
                   grounpInfo: "none",
                   grounpInfo2: "block",
 
@@ -165,7 +165,7 @@ Page({
                   one_content: "block",
                   two_content: "none",
                   bottomBGColor: '#F36619',
-                  buttomText: '我要开团',
+                  buttomText: '我要拼团',
                   grounpInfo: "none",
                   grounpInfo2: "block",
 
@@ -177,7 +177,7 @@ Page({
                   one_content: "block",
                   two_content: "none",
                   bottomBGColor: '#F36619',
-                  buttomText: '重新开团',
+                  buttomText: '重新拼团',
                   grounpInfo: "block",
                   grounpInfo2: "none",
                   remark: "none",
@@ -493,4 +493,9 @@ Page({
       path: '/pages/activity_detail/activity_detail?activityNo=' + this.data.activityNo + '&groupNo=' + this.data.groupNo,
     };
   },
+  openGroup: function (e) {
+    wx.switchTab({
+      url: '../index/index'
+    })
+  },
 })
\ No newline at end of file
diff --git a/pages/activity_detail/activity_detail.wxml b/pages/activity_detail/activity_detail.wxml
index de827d6..9a63f31 100644
--- a/pages/activity_detail/activity_detail.wxml
+++ b/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,11 +78,20 @@
       <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>
diff --git a/pages/activity_detail/activity_detail.wxss b/pages/activity_detail/activity_detail.wxss
index 4a6598f..2d9ff03 100644
--- a/pages/activity_detail/activity_detail.wxss
+++ b/pages/activity_detail/activity_detail.wxss
@@ -255,15 +255,53 @@ 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;
+
 }
 
 
@@ -279,7 +317,7 @@ image{
   font-size: 23px;
   color: #F44054;
   font-weight: bold;
-  margin-left: 0px;
+  margin-left: 28px;
   background-color: white;
   text-align: center;
   float: left;
diff --git a/pages/at_present/at_present.js b/pages/at_present/at_present.js
index 9ff7347..d5ad20e 100644
--- a/pages/at_present/at_present.js
+++ b/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;
diff --git a/pages/at_present/at_present.wxml b/pages/at_present/at_present.wxml
index 8202273..c538d5d 100644
--- a/pages/at_present/at_present.wxml
+++ b/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>