Начало Каталог Помощ
Регистрация Вход
xiaochuan
/
play-with-pc
1
0
Разклонения 0
Файлове Задачи 0 Заявки за сливане 0 Уики
Преглед на файлове

type:update 更改客户提出的反馈问题

laosan2382995021@163.com преди 3 години
родител
fac401b6ab
ревизия
031351b9a5
променени са 19 файла, в които са добавени 155 реда и са изтрити 59 реда
Разделен изглед Покажи статистика за разликите
  1. 35 6
      public/aipay.html
  2. 1 1
      public/index.html
  3. 3 2
      src/config/config.ts
  4. 1 1
      src/layout/layout-entry/data/about.ts
  5. 10 1
      src/layout/layout-order-item/mixins/handle.ts
  6. 2 1
      src/layout/layout-order-item/mixins/index.ts
  7. 3 2
      src/layout/layout-order-item/src/main.vue
  8. 1 0
      src/mixins/order/update.ts
  9. 2 2
      src/pages/talking/components/room-queue-gift/src/main.vue
  10. 1 1
      src/pages/talking/mixins/socket.ts
  11. 1 1
      src/pages/talking/mixins/utils.ts
  12. 3 2
      src/popup/popup-comment/data/inputData.ts
  13. 30 21
      src/popup/popup-comment/mixins/handle.ts
  14. 10 0
      src/popup/popup-comment/props.ts
  15. 1 1
      src/popup/popup-detail/components/game/components/comment-list/src/main.vue
  16. 20 1
      src/popup/popup-detail/components/game/components/gift-wall/mixins/handle.ts
  17. 20 7
      src/popup/popup-detail/components/game/components/gift-wall/src/main.vue
  18. 4 2
      src/store/modules/index.ts
  19. 7 7
      src/views/view-footer/data/control.ts

+ 35 - 6
public/aipay.html
Целия файл 

@@ -1,13 +1,42 @@
 
 <!DOCTYPE html>
 
-<html lang="en">
 
-<head>
 
-    <meta charset="UTF-8">
 
-    <title>Title</title>
 
+<html><head>
 
+    <meta http-equiv="content-type" content="text/html; charset=gbk">
 
+    <title>Video Test 10: RTSP Streaming</title>
 
     <script>
 
-        window.close();
 
+
 
+        function rotateMe() {
 
+            i = 0;
 
+            int = setInterval(
 
+                function () {
 
+                    video.style.WebkitTransform = 'rotate(' + (i++ %360) + 'deg)';
 
+                    video.style.MozTransform = 'rotate(' + (i++ %360) + 'deg)';
 
+                    video.style.OTransform = 'rotate(' + (i++ %360) + 'deg)';
 
+                }, 50);
 
+        }
 
+
 
+        function resetRotation() {
 
+            video.style.WebkitTransform = 'rotate(0)';
 
+            video.style.MozTransform = 'rotate(0)';
 
+            video.style.OTransform = 'rotate(0)';
 
+        }
 
+
 
     </script>
 
 </head>
 
+
 
 <body>
 
 
 </body>
 
-</html>
 
+<script>
 
+
 
+    var ws = new WebSocket('ws://60.232.192.24:559/openUrl/RDygh56');
 
+
 
+    ws.onopen = function () {
 
+        console.log('Á´½Ó³É¹¦');
 
+    }
 
+
 
+    ws.onmessage = function (evt) {
 
+        console.log(evt);
 
+    }
 
+
 
+</script>
 
+</html>

+ 1 - 1
public/index.html
Целия файл 

@@ -27,7 +27,7 @@
 
                   multiple:100,  // 倍数
 
                   ref:1920,  // 参照，
 
                   startHeight: window.innerHeight,
 
-                  maxWidth:1920,
 
+                  maxWidth:1800,
 
                   minWidth: 1600
 
               };

+ 3 - 2
src/config/config.ts
Целия файл 

@@ -3,8 +3,8 @@ export default <Config>{
 
 
     baseApiURL:'/api',
 
 
-    // baseURL:'https://qiaoyudj.com/',
 
-    baseURL:'https://newqiaoyu.lanmaonet.com/',
 
+    baseURL:'https://qiaoyudj.com/',
 
+    // baseURL:'https://newqiaoyu.lanmaonet.com/',
 
     // baseURL:'http://newqiaoyu.com/',
 
 
     app:undefined,
 
@@ -34,6 +34,7 @@ export default <Config>{
 
     register(vm,plugs){
 
         vm.$store.dispatch('initializationUserPromise').then(()=>this.plugRegister()).catch(()=>this.plugRegister());
 
         vm.$store.dispatch('initializationPayPromise');
 
+        vm.$store.dispatch('getConfigPromise');
 
 
         // @ts-ignore
 
         window.RongIMLib.RongIMEmoji.init();

+ 1 - 1
src/layout/layout-entry/data/about.ts
Целия файл 

@@ -14,7 +14,7 @@ export default {
 
         }
 
     ],
 
 
-    label:'版权所有© ****网络科技有限公司 *公网安备42018502004524号 备案号：*ICP备20007050号',
 
+    label:'版权所有© 郑州巧鱼约玩网络科技有限公司 豫公网安备 41010302002767号 备案号：豫ICP备2020028491号-1',
 
 
     trigger: new LocationTrigger('https://www.baidu.com')

+ 10 - 1
src/layout/layout-order-item/mixins/handle.ts
Целия файл 

@@ -119,7 +119,16 @@ export default <LibMixins>{
 
                 order_sn: this.item.order_sn,
 
                 uid: this.item.player_uid,
 
                 gid: this.item.gid,
 
-                pid: this.item.pid
 
+                pid: this.item.pid,
 
+                comment: this.item.service_comment,
 
+                rate: this.item.service_rate,
 
+                commentSuccess:(data)=>{
 
+                    for (let key in data) {
 
+                        if (data.hasOwnProperty(key) && this.item[key] !== data[key]) {
 
+                            this.item[key] = data[key];
 
+                        }
 
+                    }
 
+                }
 
             });
 
         }

+ 2 - 1
src/layout/layout-order-item/mixins/index.ts
Целия файл 

@@ -1,3 +1,4 @@
 
 import handle from './handle';
 
+import time from './time';
 
 import user from '$mixins/user';
 
-export default [handle,user];
 
+export default [handle,user,time];

+ 3 - 2
src/layout/layout-order-item/src/main.vue
Целия файл 

@@ -4,7 +4,8 @@
 
       <div>订单号：{{item.order_sn}}</div>
 
       <div class="layout-order-margin">下单时间：{{item.add_time_format}}</div>
 
       <div class="flex-1"></div>
 
-      <div class="layout-order-status">{{item.statusName}}</div>
 
+
 
+      <div class="layout-order-status">{{OrderPayStatus.have === item.status ? (timeFormat || item.statusName) :item.statusName}}</div>
 
     </header>
 
     <footer class="rowACenter layout-order-footer">
 
       <v-image radius="50%" :src="item.player_head_pic" class="layout-order-avatar"></v-image>
 
@@ -56,4 +57,4 @@ export default {
 
 }
 
 </script>
 
 
-<style scoped lang="scss" src="../style.scss"></style>
 
+<style scoped lang="scss" src="../style.scss"></style>

+ 1 - 0
src/mixins/order/update.ts
Целия файл 

@@ -34,6 +34,7 @@ export default <LibMixins>{
 
                     item = JSON.parse(JSON.stringify(resultItem));
 
                     item.buttonGroup = orderControl.getButtonGroup(status,this.orderStatus);
 
                     item.statusName = orderControl.getStatusName(status,this.orderStatus);
 
+                    item.status = status;
 
                 }
 
             } catch (e) {

+ 2 - 2
src/pages/talking/components/room-queue-gift/src/main.vue
Целия файл 

@@ -24,7 +24,7 @@
 
                 v-if="useQueueItem.draw"
 
                 :playStatus="useQueueItem.play"
 
                 size="45%"
 
-                :src="(useQueueItem.item.show_gift_pc_img || useQueueItem.item.play_image)+'?id='+useQueueItem._id+'-'+index"
 
+                :src="(useQueueItem.item.pcplay_image || useQueueItem.item.play_image)+'?id='+useQueueItem._id+'-'+index"
 
                 :defaultSrc="useQueueItem.item.base_image"
 
                 @stop="triggerStopQueue(useQueueItem._unique)"
 
                 :loops="1"
 
@@ -35,7 +35,7 @@
 
           <svg-animate
 
               class="room-admission-svg"
 
               :key="useQueueItem._id"
 
-              :src="(useQueueItem.item.show_gift_pc_img || useQueueItem.item.play_image)+'?id='+useQueueItem._id"
 
+              :src="(useQueueItem.item.pcplay_image || useQueueItem.item.play_image)+'?id='+useQueueItem._id"
 
               :loops="1"
 
               mode="AspectFit"
 
               @stop="triggerStopQueue(useQueueItem._unique)"

+ 1 - 1
src/pages/talking/mixins/socket.ts
Целия файл 

@@ -128,7 +128,7 @@ export default {
 
                     gift_name: data.e_name,
 
                     gift_type: data.type,
 
                     play_image: data.show_gift_img || data.show_gif_img,
 
-                    pcplay_image: data.show_gift_pc_img,
 
+                    pcplay_image: data.pcplay_image || data.show_gift_pc_img,
 
                     base_image: data.show_img,
 
                     gift_price: data.gift_price || 0
 
                 }

+ 1 - 1
src/pages/talking/mixins/utils.ts
Целия файл 

@@ -42,7 +42,7 @@ export default <LibMixins>{
 
             }
 
 
             // 检查权限是否屏蔽了进场特效
 
-            if (!user.getDataItem(UserConfigType.shield,Shield.gift) && item.play_image) {
 
+            if (!user.getDataItem(UserConfigType.shield,Shield.gift) && (item.pcplay_image || item.play_image)) {
 
                 // 添加入场动画
 
                 this.$refs.queueGift && this.$refs.queueGift.pushGift(item,uid,sendUid);
 
             }

+ 3 - 2
src/popup/popup-comment/data/inputData.ts
Целия файл 

@@ -1,17 +1,18 @@
 
-export default function (){
 
+export default function (data){
 
     return [
 
         {
 
             label:'商品评分',
 
             component:'rate',
 
             rules:'请打分',
 
             key:'service_rate',
 
-            value:''
 
+            value:data.rate || 0
 
         },
 
         {
 
             label:'商品评价',
 
             placeholder:'分享你的体验心得',
 
             key:'service_comment',
 
             rules:'',
 
+            value: data.comment || '',
 
             maxLength:200
 
         }
 
     ]

+ 30 - 21
src/popup/popup-comment/mixins/handle.ts
Целия файл 

@@ -5,35 +5,44 @@ export default <LibMixins>{
 
 
     data(){
 
         return {
 
-            inputData: inputData()
 
+            inputData: []
 
         }
 
     },
 
 
     methods:{
 
 
+        submitVerify(callback){
 
+            return verification.verificationPromise(this.inputData,true).then(callback);
 
+        },
 
+
 
         submit(obj){
 
-            return verification.verificationPromise(this.inputData,true).then((data)=>{
 
-                data.oid = this.oid;
 
-                data.uid = this.uid;
 
-                data.pid = this.pid;
 
-                data.gid = this.gid;
 
-                this.$request({
 
-                    url:'player/evaluate_order',
 
-                    data,
 
-                    token:true,
 
-                    message:true
 
-                }).then((data)=>{
 
-
 
-                    if (data.isSuccess) {
 
-                        return this.close();
 
-                    } else {
 
-                        return obj.none();
 
-                    }
 
-
 
-                }).catch(obj.fail);
 
-            });
 
+            let data = obj.data;
 
+            data.oid = this.oid;
 
+            data.uid = this.uid;
 
+            data.pid = this.pid;
 
+            data.gid = this.gid;
 
+            this.$request({
 
+                url:'player/evaluate_order',
 
+                data,
 
+                token:true,
 
+                message:true
 
+            }).then((data)=>{
 
+
 
+                if (data.isSuccess) {
 
+                    // @ts-ignore
 
+                    this.$attrs.commentSuccess && this.$attrs.commentSuccess(obj.data);
 
+                    return this.close();
 
+                } else {
 
+                    return obj.none();
 
+                }
 
+
 
+            }).catch(obj.fail);
 
         }
 
 
+    },
 
+
 
+    created() {
 
+        this.inputData = inputData(this);
 
     }
 
 
 }

+ 10 - 0
src/popup/popup-comment/props.ts
Целия файл 

@@ -30,6 +30,16 @@ export default {
 
     order_sn:{
 
         type:String,
 
         default:''
 
+    },
 
+
 
+    comment:{
 
+        type:String,
 
+        default:''
 
+    },
 
+
 
+    rate:{
 
+        type:Number,
 
+        default:0
 
     }
 
 
 }

+ 1 - 1
src/popup/popup-detail/components/game/components/comment-list/src/main.vue
Целия файл 

@@ -51,7 +51,7 @@ export default {
 
           item.comment_time = DateFormat(item.comment_time,'MM-DD hh:mm');
 
           return item;
 
         }));
 
-      }).catch(obj);
 
+      }).catch(obj.fail);
 
     }
 
   },
 
   props

+ 20 - 1
src/popup/popup-detail/components/game/components/gift-wall/mixins/handle.ts
Целия файл 

@@ -31,8 +31,27 @@ export default {
 
                 }
 
             }).then((data)=>{
 
                 data.data = data.data || {};
 
-                this.data = data.data.list || [];
 
+
 
+                let useData =data.data.list || [];
 
+
 
+                if (useData.length > 0) {
 
+                    let row = Math.ceil(useData.length / 5);
 
+                    let rowLast = row % 3;
 
+
 
+                    if (rowLast > 0 ) {
 
+                        let surplusRow =  3 - rowLast;
 
+                        let surplusNumber = useData.length % 5;
 
+                        useData.length = useData.length + (surplusRow * 5) + surplusNumber;
 
+                    }
 
+
 
+                }
 
+                this.data = useData;
 
+
 
+
 
                 this.sum_price_total = data.data.sum_price_total;
 
+
 
+
 
+
 
                 return obj.success(this.data);
 
             }).catch(obj.fail);
 
         }

+ 20 - 7
src/popup/popup-detail/components/game/components/gift-wall/src/main.vue
Целия файл 

@@ -7,7 +7,7 @@
 
         emptyColor="#666"
 
     >
 
       <template v-slot:page>
 
-        <section class="screen">
 
+        <section class="screen flex">
 
           <header class="rowACenter gift-wall-header">
 
             <span>礼物总价值:</span>
 
             <span><img src="@/assets/images/currency.png" class="gift-wall-currency" /><span class="gift-wall-price">{{sum_price_total || 0}}</span></span>
 
@@ -17,14 +17,27 @@
 
                     :swiper-option="swiperOption"
 
                     :pagination="true"
 
             >
 
-              <swiper-item
 
+              <template
 
                   v-for="(item,index) in data"
 
-                  :key="'gift-'+index"
 
-                  class="gift-wall-item center"
 
               >
 
-                <v-image :src="item.base_image" class="gift-wall-icon" backgroundColor="transparent"></v-image>
 
-                <div class="gift-wall-number line-1">{{item.sum_gift_num || 1}}</div>
 
-              </swiper-item>
 
+                <swiper-item
 
+                    v-if="!item"
 
+                    :key="'gift-'+index"
 
+                    class="gift-wall-item center"
 
+                    style="opacity: 0"
 
+                >
 
+                </swiper-item>
 
+                <swiper-item
 
+                    v-else
 
+                    :key="'gift-'+index"
 
+                    class="gift-wall-item center"
 
+                >
 
+                  <v-image :src="item.base_image" class="gift-wall-icon" backgroundColor="transparent"></v-image>
 
+                  <div class="gift-wall-number line-1">{{item.sum_gift_num || 1}}</div>
 
+                </swiper-item>
 
+
 
+              </template>
 
+
 
             </swiper>
 
           </section>
 
         </section>

+ 4 - 2
src/store/modules/index.ts
Целия файл 

@@ -4,6 +4,7 @@ import pay from './pay';
 
 import gift from './gift';
 
 import router from './router';
 
 import chat from './chat';
 
+import config from './config';
 
 import {ModuleTree} from "vuex";
 
 
 export default <ModuleTree<any>>{
 
@@ -12,5 +13,6 @@ export default <ModuleTree<any>>{
 
     pay,
 
     gift,
 
     router,
 
-    chat
 
-};
 
+    chat,
 
+    config
 
+};

+ 7 - 7
src/views/view-footer/data/control.ts
Целия файл 

@@ -4,19 +4,19 @@ import popup from "$utils/tool/popup";
 
 import {PopupExportComponent} from "$popup/popup-export/const";
 
 
 import personalDetail, {OpenType} from '$utils/control/personal-detail';
 
-import user from "$config/user";
 
 
 export default <LibDataArray>[
 
     {
 
         label:'急速点单',
 
         icon:require('../images/quick.png'),
 
         trigger: new FunctionTrigger(function (item){
 
-            return personalDetail.openDetail({
 
-                rid: 12,
 
-                room_cover: "http://newqiaoyu.com//uploads/all/20210706/f15b82e2c2d4d0af4b76fa2a14bc9c9d.png",
 
-                room_name: "然心动—你爱我我爱你❤怦",
 
-                room_number: 99999
 
-            },OpenType.room);
 
+
 
+            this.$store.dispatch('getConfigPromise',true).then((data)=>{
 
+                return personalDetail.openDetail({
 
+                    rid: data.quick_order_room_id
 
+                },OpenType.room);
 
+            });
 
+
 
         }),
 
     },
 
     {