dever 4 years ago
parent
commit
da135938b7
2 changed files with 20 additions and 13 deletions
  1. 10 8
      pages/dream/buy.vue
  2. 10 5
      pages/dream/index.vue

+ 10 - 8
pages/dream/buy.vue

@@ -12,8 +12,7 @@
 			  </view>
 			</scroll-view>
 			<view class="btn-wrapper ">
-			  <view class="button cancel" @click="hideBuy">取消
-			  </view>
+			  <view class="button cancel" @click="hideBuy">取消</view>
 			  <view class="button primary" :style="bgcolor" @click="buyAct">确认
 				<button formType="submit"></button>
 			  </view>
@@ -62,8 +61,11 @@
 					<input type="text" class="grace-form-input" style="text-align:left" name="desc" @blur="saveTicket" @confirm="saveTicket" v-model="fetch.ticket.desc" placeholder="在这里输入一句话,你的好友能够看到哦~" />
 				</view>
 			</view>
-			<view class="btn-wrapper">
-			  <view class="button" @click="onShare" :style="bgcolor">分享</view>
+			<view class="btn-wrapper">
+				<view class="button cancel" @click="hideShare">取消</view>
+				<view class="button primary" :style="bgcolor" @click="onShare">分享
+					<button formType="submit"></button>
+				</view>
 			</view>
 		  </view>
 		</view>
@@ -259,12 +261,12 @@ export default {
   color: #fff;
   border-color: #000;
 }
-.buy-layer .btn-wrapper{
+.btn-wrapper{
   display: flex;
   justify-content: space-between;
   padding-top: 20rpx;
 }
-.buy-layer .btn-wrapper .button{
+.btn-wrapper .button{
   border: 0;
   min-width: 0;
   box-sizing: border-box;
@@ -272,11 +274,11 @@ export default {
   width: 284rpx;
   border-radius: 5rpx;
 }
-.buy-layer .btn-wrapper .button.primary{
+.btn-wrapper .button.primary{
   border:0;
   color: #fff;
 }
-.buy-layer .btn-wrapper .button.cancel{
+.btn-wrapper .button.cancel{
   border:0;
   background-color: #CCCCCC;
   color: #fff;

+ 10 - 5
pages/dream/index.vue

@@ -45,15 +45,20 @@
 			
 			<dever-share ref="share" :id="id" :code="fetch.code" :data="fetch.share" v-if="fetch.share"></dever-share>
 			
-			<view class="mask buy-layer" v-if="inviteState && fetch.info.user">
+			<view class="mask buy-layer" v-if="inviteState && fetch.share_user">
 			  <view class="buytip-layer layer " catchtap="handleStop">
-				<view class="buy-tit buy-user"><image :src="fetch.info.user.avatar" mode="widthFix"></image></view>
-				<view class="buy-tit" style="margin-top: 10rpx;">{{fetch.info.user.username}}赠送</view>
-				<view>
-					<text class="p">“牡丹花下死,做鬼也风流”</text>
+				<view class="buy-tit buy-user"><image :src="fetch.share_user.avatar" mode="widthFix"></image></view>
+				<view class="buy-tit" style="margin-top: 10rpx;">{{fetch.share_user.username}}赠送</view>
+				<view v-if="fetch.share_user.ticket && fetch.share_user.ticket.desc">
+					<text class="p">“{{fetch.share_user.ticket.desc}}”</text>
 					<text class="p">——他是这么说的</text>
 				</view>
 				
+				<view v-else>
+					<text class="p">“{{fetch.share.content}}”</text>
+					<text class="p">——{{fetch.share.title}}</text>
+				</view>
+				
 				<view class="btn-wrapper">
 				  <view class="button cancel" @click="hideInvite">不要
 				  </view>