edit

lib/colorui/main.css

@@ -16,7 +16,7 @@ body {
 	color: #333333;
 	font-family: Helvetica Neue, Helvetica, sans-serif;
 }
-
+view,
 scroll-view,
 swiper,
 button,

lib/community/y-Fab/y-Fab.vue

@@ -1,6 +1,6 @@
 <template>
 	<view @touchmove.stop.prevent>
-		<view class="yc-fab-box ycFly_o" :class="{'yc-fab-right':!left || (left && right)}" :style="{zIndex: (hidden ? '-1000': '99999'),left:getLeft(),right:getRight(),bottom:bottom+'rpx'}">
+		<view class="yc-fab-box ycFly_o" :class="{'yc-fab-right':!left || (left && right)}" :style="{left:getLeft(),right:getRight(),bottom:bottom+'rpx'}">
 			<view class="yc-fab-btn" :class="{'yc-visible':isOpen,'yc-fab-hidden':hidden}">
 				<view class="yc-fab-item-box" :class="{'yc-fab-item-left':left && !right && item.imgUrl}" v-for="(item,index) in btnList"
 				 :key="index" @tap.stop="handleClick(index)">
@@ -186,7 +186,7 @@
 		justify-content: center;
 		flex-direction: column;
 		position: fixed;
-		/*z-index: 99997;*/
+		z-index: 99997;
 	}
 
 	.yc-fab-right {
@@ -201,7 +201,7 @@
 	}
 
 	.yc-fab-hidden {
-		display: hidden;
+		display: none;
 		/*
 		width: 0;
 		height: 0;

lib/dever/components/seat.vue

@@ -18,7 +18,7 @@
 							<image v-else-if="seat.type===2" class="w-100 h-100" :id="seat.TipsId" src="@/static/seat/bought.png" mode="aspectFit" style="width:40rpx;height:40rpx;border-radius:50%;margin-top: -1px;" :src="seat.User.avatar" @click="showTips(seat.TipsId, seat.Id, seat.Tips, seat.SeatCode, seat.User)"></image>
 						</view>
 					</view>
-					<view class="pt-f bg-line br-15 over-h" :style="'left: '+(10-moveX/scale)+'px;top:112rpx;width:30rpx;'">
+					<view class="pt-f bg-line br-15 over-h" :style="'left: '+(20-moveX/scale)+'px;top:112rpx;width:30rpx;'">
 						<view class="w-100 dp-f ai-c jc-c fz-22 color-fff" :style="'height:'+seatSize+'px;margin-top:20rpx;'" v-for="(m,mindex) in mArr"
 						 :key="mindex">{{m}}</view>
 						<view :style="'height: 20rpx;'"></view>
@@ -701,6 +701,7 @@
 
 	.mt-20 {
 		margin-top: 20rpx;
+		margin-left: 30rpx;
 	}
 
 	.pa-v-2 {

pages/dream/func/share.vue

@@ -47,12 +47,12 @@
 			
 			<button class="onSave" @click="showRes">
 				<view class="lg text-gray cuIcon-picfill" style="width:70rpx;height:70rpx"></view>
-				<text>图片</text>
+				<text>素材</text>
 			</button>
 			
 			<button class="onSave" @click="showPoster">
 				<view class="lg text-gray cuIcon-btn" style="width:70rpx;height:70rpx"></view>
-				<text>合成</text>
+				<text>海报</text>
 			</button>
 		</view>
 

pages/dream/index.vue

@@ -56,6 +56,10 @@
 				<buy :id="id" :bgcolor="fetch.button.bgcolor" :color="fetch.button.color" :code="fetch.code" :name="fetch.info.name" @hideBuy="hideBuy" @share="share" @view="view"></buy>
 			</view>
 			
+			<view v-if="passState">
+				<pass :id="id" :bgcolor="fetch.button.bgcolor" :color="fetch.button.color" :code="fetch.code" :name="fetch.info.name" @hidePass="hidePass" @share="share" @view="view"></pass>
+			</view>
+			
 			<view v-if="rankingState">
 				<ranking :id="id" :bgcolor="fetch.button.bgcolor" :color="fetch.button.color" @hideRanking="hideRanking"></ranking>
 			</view>
@@ -106,6 +110,7 @@
 <script>
 	import mpHtml from "@/lib/mp-html/mp-html.vue";
 	import buy from "@/pages/dream/buy.vue";
+	import pass from "@/pages/dream/pass.vue";
 	import ranking from "@/pages/dream/ranking.vue";
 	import info from "@/pages/dream/info.vue";
 	import deverShare from '@/lib/dever/components/share.vue';
@@ -129,6 +134,7 @@
 					}
 				},
 				buyState : false,
+				passState : false,
 				rankingState : false,
 				infoState : false,
 				inviteState : true,
@@ -177,7 +183,7 @@
 					this.goRanking();
 				}
 				else if (v.type == 10) {
-					this.Dever.location(v.link);
+					this.Dever.location(v.link, 'webview', v.name);
 				}
 			},
 			goView : function() {
@@ -227,10 +233,17 @@
 				});
 			},
 			showBuy : function() {
-				if (this.fetch.is_ticket) {
+				if (this.fetch.info.buy == 1 && this.fetch.is_ticket) {
 					this.buyState = true;
+				} else if (this.fetch.info.password) {
+					this.passState = true;
+				} else {
+					this.Dever.alert('库存没有了');
 				}
 			},
+			hidePass : function() {
+				this.passState = false;
+			},
 			hideBuy : function() {
 				this.buyState = false;
 			},
@@ -251,15 +264,12 @@
 			}
 		},
 		components:{
-			buy,ranking,info,deverShare,mpHtml
+			buy,pass,ranking,info,deverShare,mpHtml
 		}
 	}
 </script>
 
 <style lang="scss" scoped>
-view {
-	box-sizing: border-box;
-}
 page {
 	max-height: 100%;
 }

pages/dream/view.vue

@@ -359,6 +359,10 @@ export default{
 		},
 		clickDrawerButton : function(e) {
 			var key = this.drawer.button[e.index].key;
+			if (key == 'return') {
+				this.Dever.location('dream/index?code=' + this.Dever.config.code, 'go');
+				return;
+			}
 			if (key != 'bgm') {
 				this.showDrawer(key);
 			}
@@ -372,11 +376,7 @@ export default{
 	}
 }
 </script>
-<style>
+<style>
-@import '@/static/dreamland/css/core.css';
-view {
-	box-sizing: border-box;
-}
 .container {
   position: absolute;
   height: 100%;

pages/index/foot.vue

@@ -70,7 +70,10 @@ export default {
 	}
 }
 </script>
-<style>
+<style>
+view {
+	box-sizing: unset;
+}
 .gui-footer-icon-buttons{width:130rpx; height:80rpx; padding:10rpx; flex:1; position:relative; margin:0; background-color:#F8F8F8;}
 .gui-footer-buttons-ab{position:absolute; z-index:101; left:325rpx; top:0rpx; width:110rpx; height:150rpx;}
 .gui-footer-buttons-ab-icon{width:110rpx; height:110rpx; line-height:120rpx; text-align:center; font-size:68rpx; background-color:#F7F8FA; border-radius:100rpx;}

pages/index/index.vue

@@ -18,13 +18,31 @@
 						</button>
 					</view>
 				</view>
-			</block>
+			</block>
-		</view>
+			<gui-modal ref="show" :title="title">
+				<view slot="content" class="gui-padding gui-bg-gray">
+					<text class="gui-block-text gui-text-center gui-text gui-color-gray" 
+					style="line-height:100rpx; padding:10rpx;">{{content}}</text>
+				</view>
+				<!-- 利用 flex 布局 可以放置多个自定义按钮哦  -->
+				<view slot="btns" class="gui-flex gui-rows gui-space-between">
+					<view class="modal-btns gui-flex1" style="margin-right:80rpx;">
+						<text class="modal-btns gui-color-gray" @tap="close">取消</text>
+					</view>
+					<view class="modal-btns gui-flex1" style="margin-left:80rpx;">
+						<text class="modal-btns gui-color-blue" @tap="copy">复制</text>
+					</view>
+				</view>
+			</gui-modal>
+		</view>
+
 		<foot ref="foot" slot="gFooter" :value="foot_value"></foot>
-		<dever-share ref="share" :data="fetch.share" v-if="fetch.share"></dever-share>
+		<dever-share ref="share" :data="fetch.share" v-if="fetch.share"></dever-share>
+		
 	</gui-page>
 </template>
 <script>
+import copyText from "@/lib/clipboard.thorui.js"; 
 import deverShare from '@/lib/dever/components/share.vue';
 import foot from '@/pages/index/foot.vue';
 export default {
@@ -40,10 +58,12 @@ export default {
 				xuanchuan : [],
 				share : false,
 			},
+			title : '',
+			content : '',
 		}
 	},
 	components:{
-		deverShare,foot
+		deverShare,foot,copyText
 	},
 	onLoad() {
 		this.getInfo();
@@ -62,7 +82,29 @@ export default {
 			this.Dever.get(this, 'app/collection/?l=api.home', {id:-1});
 		},
 		location : function(v) {
-			this.Dever.location(v.link, 'webview', v.name);
+			if (v.link) {
+				this.Dever.location(v.link, 'webview', v.name);
+			} else if (v.desc) {
+				this.title = v.name;
+				this.content = v.desc;
+				this.$refs.show.open();
+			} else {
+				this.Dever.alert('敬请期待');
+			}
+		},
+		close : function() {
+			this.$refs.show.close();
+		},
+		copy : function() {
+			var self = this;
+			copyText.getClipboardData(this.content, function(res) {
+				if (res) {
+					self.close();
+					self.Dever.alert('复制成功');
+				} else {
+					self.Dever.alert('复制失败');
+				}
+			});
 		}
 	}
 }
@@ -70,5 +112,6 @@ export default {
 <style>
 .demo{width:210rpx; margin:10rpx;}
 .button{width:90rpx; height:90rpx; line-height:90rpx; border-radius:8rpx; margin:10rpx;}
-.button-text{font-size:38rpx; text-align:center;}
+.button-text{font-size:38rpx; text-align:center;}
+.modal-btns{line-height:88rpx; font-size:26rpx; text-align:center; width:200rpx;}
 </style>

pages/index/list.vue

@@ -3,21 +3,21 @@
 	:footerSets="{height:150, zIndex:100, bg:'none'}" :isLoading="pageLoading">
 		<!-- 页面主体 -->
 		<view slot="gBody">
-			<block v-if="state == 1">
-				<view class="gui-margin-top">
-					<gui-swiper :swiperItems="fetch.focus" 
-					:width="750" :height="330" @taped="taped"></gui-swiper>
-				</view>
-						
-				<view class="gui-flex gui-rows gui-justify-content-center gui-margin-top">
-					<view style="width:500rpx;">
-						<gui-segmented-control :items="cate" :current="0" borderRadius="50rpx" @change="menu"></gui-segmented-control>
-					</view>
-				</view>
-			
 			
+			<view class="gui-margin-top">
+				<gui-swiper :swiperItems="fetch.focus" 
+				:width="750" :height="330" @taped="taped"></gui-swiper>
+			</view>
+					
+			<view class="gui-flex gui-rows gui-justify-content-center gui-margin-top">
+				<view style="width:500rpx;">
+					<gui-segmented-control :items="cate" :current="0" borderRadius="50rpx" @change="menu"></gui-segmented-control>
+				</view>
+			</view>
+		
+			<block v-if="state == 1">
 				<view class="gui-grids gui-flex gui-rows gui-wrap gui-margin-top gui-bg-gray menu">
-					<gui-switch-navigation :items="fetch.cate" :currentIndex="nav_index" @change="nav"  activeDirection="center" textAlign="center" :margins="20" paddings="30rpx" activeLineHeight="4rpx" lineHeights="72rpx" activeLineWidth="100rpx" activeLineBg="linear-gradient(to right, #008AFF,#008AFF)" ></gui-switch-navigation>
+					<gui-switch-navigation :items="fetch.cate" :currentIndex="nav_index" @change="nav"  activeDirection="center" textAlign="center" activeLineBg="linear-gradient(to right, #008AFF,#008AFF)" ></gui-switch-navigation>
 				</view>
 				<view class="gui-margin gui-card-list gui-flex gui-rows gui-wrap gui-space-between gui-margin-top">
 					<view class="gui-card-item" hover-class="gui-tap" v-for="(v, k) in fetch.info" :key="k" @click="view(v.id_code)">
@@ -55,13 +55,13 @@ export default {
 	data() {
 		return {
 			foot_value : 2,
-			state : 2,
+			state : 0,
 			fetch : {
 				cate : [],
 				info : [],
 				focus : [],
 			},
-			cate : ["全部", "我的"],
+			cate : ["推荐", "私藏"],
 			cate_index: 0,//默认分类
 			nav_index : 0,
 		}

pages/index/my.vue

@@ -119,10 +119,27 @@
 			</view>
 			<block v-if="fetch.user.id > 0">
 				<view class="ucenter-line"></view>
-				<view hover-class="gui-tap" @click="quit">
+				<view hover-class="gui-tap" @click="open">
 					<text class="gui-text-center gui-block-text gui-icons logoff gui-color-gray">&#xe62e; 退出登录</text>
 				</view>
-			</block>
+			</block>
+			
+			<gui-modal ref="quit" 
+					title="确认退出">
+				<view slot="content" class="gui-padding gui-bg-gray">
+					<text class="gui-block-text gui-text-center gui-text gui-color-gray" 
+					style="line-height:100rpx; padding:10rpx;">您确定要这样退出吗？</text>
+				</view>
+				<!-- 利用 flex 布局 可以放置多个自定义按钮哦  -->
+				<view slot="btns" class="gui-flex gui-rows gui-space-between">
+					<view class="modal-btns gui-flex1" style="margin-right:80rpx;">
+						<text class="modal-btns gui-color-gray" @tap="close">取消</text>
+					</view>
+					<view class="modal-btns gui-flex1" style="margin-left:80rpx;">
+						<text class="modal-btns gui-color-blue" @tap="quit">确认</text>
+					</view>
+				</view>
+			</gui-modal>
 		</view>
 		<foot ref="foot" slot="gFooter" :value="foot_value"></foot>
 	</gui-page>
@@ -172,12 +189,19 @@ export default {
 		},
 		
 		quit : function() {
+			this.close();
 			this.Dever.setToken('');
 			var self = this;
 			this.Dever.alert('已退出', 'none', function() {
 				self.Dever.location('index/my');
 			});
 		},
+		open : function() {
+			this.$refs.quit.open();
+		},
+		close : function() {
+			this.$refs.quit.close();
+		},
 		goView : function(key, name) {
 			var path = this.Dever.api_host + 'main/?l=page&key=' + key;
 			this.Dever.location(path, 'webview', name);
@@ -193,5 +217,6 @@ export default {
 .ucenter-face-image{width:100rpx; height:100rpx;}
 .ucenter-line{height:20rpx; background-color:#F6F7F8; margin:16rpx 0;}
 .logoff{line-height:88rpx; font-size:28rpx;}
-.gui-list-title-text{line-height:60rpx;}
+.gui-list-title-text{line-height:60rpx;}
+.modal-btns{line-height:88rpx; font-size:26rpx; text-align:center; width:200rpx;}
 </style>

pages/index/news.vue

@@ -95,6 +95,7 @@ export default {
 		getInfo : function() {
 			var self = this;
 			var data = {};
+			
 			this.Dever.get(this, 'package/article/?l=api.cate', data);
 		},
 		// 新闻加载函数
@@ -107,7 +108,7 @@ export default {
 			} else {
 				data.cate = 0;
 			}
-			
+			data.noloading = 1;
 			this.Dever.get(this, 'package/article/?l=api.getList', data, function(t) {
 				if(self.page >= 2){
 					if(t.info.length <= 0){