更换

Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/378

common/api/shop.js

@@ -374,6 +374,11 @@ export default {
 			recordAppOpenTimes({appversion,device_type}){
 				// appversion=1.0.0&device_type=android/ios
 				return vm.$u.post("Member/recordAppOpenTimes",{appversion,device_type})
+			},
+			//统计直播间浏览次数
+			// https://mall.dmygkeji.com/api/Live/countLiveBrowse?live_id=1
+			countLiveBrowse({live_id}){
+				return vm.$u.post("Live/countLiveBrowse",{live_id})
 			}
       }
     }

components/index/zhibo-item/index.vue

@@ -73,6 +73,9 @@ export default {
     },
     methods:{
         zhibo(){
+            this.$u.api.countLiveBrowse({live_id:this.zid}).then((res)=>{
+                console.log(JSON.stringify(res),77)
+            })
             this.$u.route({
                 url:"/pages/zhibo/index",
                params:{
@@ -81,6 +84,7 @@ export default {
                    rid:this.rid
                } 
             })
+            
         },
         articleAddShield() {
             console.log(this.item)

pageC/cart/ConfirmOrder.vue

@@ -49,7 +49,7 @@
 					</view>
 					<view class="remark">
 						<view class="title">订单备注</view>
-						<u-input v-model="remark[index]" type="textarea" :height="88" placeholder="选填" />
+						<u-input v-model="remark[index]" type="textarea" style="margin-top:-5rpx" :height="88" placeholder="选填" />
 					</view>
 				</view>
 				<view class="pick-up" v-if="delivery.type == 3">

pageE/order/RefundOrder.vue

@@ -94,7 +94,8 @@ export default {
 		}
 	},
 	onLoad(option) {
-		this.type = option.type
+		this.type = 2; // 需求更改 所有订单只能全退，不可选择商品。
+		// this.type = option.type
 		this.oid = option.oid;
 		this.getOrderInfo(option.oid);
 	},
@@ -138,17 +139,18 @@ export default {
 		applyRefund() {
 			
 			if(this.type !=2 && !this.verifyParams()) return false;
+			// addrefundall 只需要订单id 和 说明
 			let params = {
 				order_id: this.oid,
-				goods_id: this.goods.goods_id,
+				// goods_id: this.goods.goods_id,
-				refund_amount: Number(this.totalPrice),
+				// refund_amount: Number(this.totalPrice),
 				reason_info: this.refundText,
-				goods_num: this.num,
+				// goods_num: this.num,
 			}
 			console.log(params)
 			if(this.type == 2){
 				this.$u.api.addrefundall(params).then(res => {
-					console.log(JSON.stringify(res))
+					// console.log(JSON.stringify(res))
 					if(res.errCode == 0) {
 						this.$refs.uToast.show({
 							title: res.message,

pages.json

@@ -1211,7 +1211,6 @@
 		{
 			"path": "pages/index/index",
 			"style": {
-				"enablePullDownRefresh": true,
 				"navigationStyle": "custom"
 			}
 		},

pages/zhibo/index.nvue

@@ -312,10 +312,11 @@
     width: 690rpx;
 }
 .danmuitem{
-    font-size: 26rpx;
+    font-size: 30rpx;
     color: #fff;
     flex-direction: column-reverse;
     word-wrap:anywhere;
+    font-weight: bold;
 }
 </style>
 

static/imservice.js

@@ -38,7 +38,7 @@ function CurrentUser(uuid, name, avatar) {
 function IMService() {
     this.im = GoEasyIM.getInstance({
         host:'hangzhou.goeasy.io',//qos=1
-        appkey:'BC-453aa755c4ea48148abefc55a86df283'
+        appkey:'BC-d9b5e639006b4ee2a4bc9eddc4235a6a'
     });
     this.status = false
     this.lianjie = false