Merge branch 'test'

# Conflicts:
#	src/utils/request.js

src/pages/lottery/index.vue

@@ -87,7 +87,6 @@ export default {
   },
   onLoad() {
     this.getList()
-    console.log(getApp());
   },
   methods: {
     // 获取页面信息
@@ -166,12 +165,12 @@ export default {
       this.$nextTick(() => {
         this.$refs.popup.open()
         this.disabled = true
-        this.getList()
       })
     },
 
     // 再抽一次
     getAgain() {
+      this.getList()
       this.$refs.popup.close()
       this.startCallBack()
     },
@@ -208,6 +207,7 @@ export default {
     // 关闭弹窗
     closePopup() {
       this.$refs.popup.close()
+      this.getList()
     }
   }
 }

src/pages/share/list.vue

@@ -21,7 +21,7 @@
       </view>
     </view>
     <!-- 列表 -->
-    <view class="list">
+    <view class="list" v-if="list.length > 0">
       <view class="item" v-for="item in list" :key="item.audioId" @click="getNav(item)">
         <img class="logo" :src="item.audioPic" />
         <view class="title">
@@ -31,6 +31,10 @@
         <img class="play" src="@/static/share/playbtn.png" @click.stop="open" />
       </view>
     </view>
+    <view class="no-data" v-else>
+      <img src="@/static/share/empty.png" style="width: 240rpx; height:240rpx" />
+      <view style="">暂无频道内容哦</view>
+    </view>
   </view>
 </template>
 
@@ -51,7 +55,7 @@ export default {
   onLoad(e) {
     if (e.userId) {
       this.form.userId = e.userId,
-      this.form.channelId = e.channelId
+        this.form.channelId = e.channelId
       // 频道详情
       channelDetail({
         channelId: e.channelId,
@@ -232,4 +236,11 @@ export default {
     }
   }
 }
+
+.no-data{
+  text-align: center;
+  margin-top: 200rpx;
+  color: rgba(255, 255, 255, 0.7);
+  font-size: 24rpx;
+}
 </style>

src/utils/request.js

@@ -1,6 +1,4 @@
-// const baseUrl = 'https://o3tapi.radio1964.com/web' // 测试
 const baseUrl = 'https://client.ohplay.radio1964.net/web' //生产
-// const baseUrl = 'http://192.168.0.217:8011/web' // 付新保本地'
 
 function request(e) {
   if (!e.data) {