dever 4 years ago
parent
commit
37a92073cf

+ 10 - 8
lib/community/y-DiaryItem/y-DiaryItem.vue

@@ -32,12 +32,12 @@
 			
 			<view class="text-gray text-sm text-right padding">
 				<text class="text-gray text-sm text-left sign" v-if="item.user.info">{{item.user.info}}</text>
-				<view class="icon-display" @click="updateOppose(item)">
-					<text class="cuIcon-flashbuyfill margin-lr-xs" :class="item.is_oppose ? 'text-red' : ''"></text> {{item.num_oppose}}
-				</view>
 				<view class="icon-display" @click="updateUp(item)">
 					<text class="cuIcon-appreciatefill margin-lr-xs" :class="item.is_up ? 'text-red' : ''"></text> {{item.num_up}}
 				</view>
+				<view class="icon-display" @click="updateOppose(item)">
+					<text class="cuIcon-flashbuyfill margin-lr-xs" :class="item.is_oppose ? 'text-red' : ''"></text> {{item.num_oppose}}
+				</view>
 				<view class="icon-display"  @click="updateComment(item.id)">
 					<text class="cuIcon-messagefill margin-lr-xs"></text> {{item.num_comment}}
 				</view>
@@ -54,12 +54,14 @@
 						<view class="margin-top-sm flex justify-between">
 							<view class="text-gray text-df" style="width: max-content;">{{v.cdate_string}}</view>
 							<view class="text-gray">
-								<view class="icon-display" @click="updateOppose(v)">
-									<text class="cuIcon-flashbuyfill margin-lr-xs" :class="v.is_oppose ? 'text-red' : ''"></text> {{v.num_oppose}}
-								</view>
 								<view class="icon-display" @click="updateUp(v)">
 									<text class="cuIcon-appreciatefill margin-lr-xs" :class="v.is_up ? 'text-red' : ''"></text> {{v.num_up}}
 								</view>
+								
+								<view class="icon-display" @click="updateOppose(v)">
+									<text class="cuIcon-flashbuyfill margin-lr-xs" :class="v.is_oppose ? 'text-red' : ''"></text> {{v.num_oppose}}
+								</view>
+								
 								<view class="icon-display"  @click="updateComment(item.id, v.id, v.uid)">
 									<text class="cuIcon-messagefill margin-lr-xs"></text>
 								</view>
@@ -166,7 +168,7 @@
 					item.num_up++;
 					item.is_up = true;
 				}
-				self.Dever.post('app/community/?l=api.up', {id:item.id,noloading:1});
+				self.Dever.post('app/community/?l=api.up', {code:self.Dever.config.code, type_id:item.id,noloading:1});
 			},
 			updateOppose : function(item) {
 				var self = this;
@@ -180,7 +182,7 @@
 					item.num_oppose++;
 					item.is_oppose = true;
 				}
-				self.Dever.post('app/community/?l=api.oppose', {id:item.id,noloading:1});
+				self.Dever.post('app/community/?l=api.oppose', {code:self.Dever.config.code, type_id:item.id,noloading:1});
 			},
 			updateComment : function (type_id, to_id, to_uid) {
 				this.type = this.type;

+ 2 - 2
pages/dream/view/momentItem.vue

@@ -138,7 +138,7 @@
 					del_state = 2;
 				}
 				this.Dever.confirm('确认'+text+'这条动态?', function() {
-					self.Dever.post('app/community/?l=api.delMoment', {moment_id:self.item.id,state:self.item.del_state}, function(t) {
+					self.Dever.post('app/community/?l=api.delMoment', {code:self.Dever.config.code, moment_id:self.item.id,state:self.item.del_state}, function(t) {
 						self.item.del = del;
 						self.item.del_state = del_state;
 					});
@@ -164,7 +164,7 @@
 					this.item.up_list.user['user_' + this.user.id]['username_text'] = this.user.username_text;
 					this.item.up_list_total += 1;
 				}
-				self.Dever.post('app/community/?l=api.up', {id:this.item.id,type:this.type,noloading:1});
+				self.Dever.post('app/community/?l=api.up', {code:self.Dever.config.code, type_id:this.item.id,type:this.type,noloading:1});
 			},
 			updateComment : function (type_id, to_id, to_uid) {
 				this.type = this.type;

+ 1 - 1
pages/dream/view/product.vue

@@ -38,7 +38,7 @@
 			</view>
 			<!-- 评论区 -->
 			<view class="cu-list menu-avatar" v-if="active == 1">
-				<view class="cu-item " v-for="(v, k) in fetch.order" :key="k">
+				<view class="cu-item " style="background-color: rgba(0,0,0,0); " v-for="(v, k) in fetch.order" :key="k">
 					<view class="cu-avatar radius lg" :style="{backgroundImage:'url('+v.user.avatar+')'}"></view>
 					<view class="content">
 						<view class="text-pink"><view class="text-cut"><text v-if="v.user.author" style="margin-right:10rpx;color: #00B3FF;">[{{v.user.author}}]</text>{{v.user.username}}</view><text v-if="v.user.title" style="margin-left:10rpx">({{v.user.title}})</text></view>

+ 12 - 3
pages/user/login.vue

@@ -78,7 +78,8 @@
 		data() {
 			return {
 				id : 0,
-				code : '',
+				code : '',
+				info : {},
 				system_logo : '',
 				system_name : '',
 				phoneData:'', // 用户/电话
@@ -113,7 +114,8 @@
 							title:t.info.name
 						});
 						self.system_logo = t.info.logo;
-						self.system_name = t.info.name;
+						self.system_name = t.info.name;
+						self.info = t.info;
 					});
 				} else {
 					self.system_logo = self.Dever.config.system_logo;
@@ -165,10 +167,17 @@
 				if (self.verCode.length != 6) {
 					self.Dever.alert('验证码不正确');
 				    return false;
+				}
+				
+				var type = '';
+				var type_id = '';
+				if (self.id || self.code) {
+					type = 'collection/info';
+					type_id = self.info.id;
 				}
 				
 				self.isRotate = true;
-				self.Dever.post('package/passport/?l=app.login', {noloading:1, mobile: self.phoneData, mcode: self.verCode, source_type: self.Dever.source, system_source:self.Dever.source_id}, function(t) {
+				self.Dever.post('package/passport/?l=app.login', {noloading:1, mobile: self.phoneData, mcode: self.verCode, source_type: self.Dever.source, system_source:self.Dever.source_id, type:type, type_id:type_id}, function(t) {
 					self.isRotate = false;
 					self.Dever.setToken(t.signature);
 					self.Dever.jump();