From 539ff8b10d4ce8379f87ce8a5826bc50f2752cd8 Mon Sep 17 00:00:00 2001
From: nineven <nineven@qq.com>
Date: Fri, 15 May 2020 10:26:41 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dios=20=E5=BE=AE=E4=BF=A1?=
 =?UTF-8?q?=E4=B8=8B=E6=B2=A1=E6=9C=89=E5=BC=95=E5=AF=BC=EF=BC=8C=E5=85=B3?=
 =?UTF-8?q?=E8=81=94=E5=BA=94=E7=94=A8=E8=AE=BE=E7=BD=AE=E5=AF=86=E7=A0=81?=
 =?UTF-8?q?=EF=BC=8C=E4=B8=8B=E8=BD=BD=E4=B8=8D=E6=98=BE=E7=A4=BA=E5=AF=86?=
 =?UTF-8?q?=E7=A0=81=E6=A1=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 fir_client/src/components/FirAppInfostimeline.vue | 4 ++--
 fir_client/src/components/FirDownload.vue         | 4 ++--
 fir_download/src/components/FirDownload.vue       | 4 ++--
 fir_ser/api/utils/serializer.py                   | 2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/fir_client/src/components/FirAppInfostimeline.vue b/fir_client/src/components/FirAppInfostimeline.vue
index 785246a..6ebb911 100644
--- a/fir_client/src/components/FirAppInfostimeline.vue
+++ b/fir_client/src/components/FirAppInfostimeline.vue
@@ -46,9 +46,9 @@
 
                     <el-input v-if="app.editing.binary_url"
                               v-model="app.binary_url"
-                              placeholder="下载地址,默认本服务器，填写第三方可以 自动跳转到第三方平台">
+                              placeholder="下载地址,默认本服务器，填写第三方可以 自动跳转到第三方平台" clearable>
                     </el-input>
-                    <div class="release-actions editing " v-if="app.editing.binary_url">
+                    <div class="release-actions editing " v-if="app.editing.binary_url" style="margin-top: 10px">
 
                         <button class="btn-cancel" @click="endEdit(app,'binary_url')"><span
                         >取消</span></button>
diff --git a/fir_client/src/components/FirDownload.vue b/fir_client/src/components/FirDownload.vue
index f7d8582..356f0dc 100644
--- a/fir_client/src/components/FirDownload.vue
+++ b/fir_client/src/components/FirDownload.vue
@@ -6,7 +6,7 @@
         </el-header>
         <el-main>
 
-            <div class="wechat_tip_content" v-if="agent === 'wxandroid'">
+            <div class="wechat_tip_content" v-if="agent === 'wxandroid' || agent === 'wxapple'">
                 <div class="wechat_tip">
                     <i class="triangle-up"></i>请点击右上角<br>选择"浏览器中打开"
                 </div>
@@ -59,7 +59,7 @@
 
                                     <div id="actions" class="actions" v-if="agent !==''">
 
-                                        <el-button type="info" round v-if="agent === 'wxandroid'">不支持在微信内下载安装
+                                        <el-button type="info" round v-if="agent === 'wxandroid' || agent === 'wxapple'">不支持在微信内下载安装
                                         </el-button>
 
                                         <button type="button" v-else-if="wrong">{{ msg }}</button>
diff --git a/fir_download/src/components/FirDownload.vue b/fir_download/src/components/FirDownload.vue
index 1d1a41f..f586ada 100644
--- a/fir_download/src/components/FirDownload.vue
+++ b/fir_download/src/components/FirDownload.vue
@@ -4,7 +4,7 @@
 
     <header style="height: 60px"></header>
 
-      <div class="wechat_tip_content" v-if="agent === 'wxandroid'">
+      <div class="wechat_tip_content" v-if="agent === 'wxandroid' || agent === 'wxapple'">
         <div class="wechat_tip">
           <i class="triangle-up"></i>请点击右上角<br>选择"浏览器中打开"
         </div>
@@ -53,7 +53,7 @@
 
                   <div id="actions" class="actions" v-if="agent !==''">
 
-                    <button type="info" round v-if="agent === 'wxandroid'">不支持在微信内下载安装
+                    <button type="info" round v-if="agent === 'wxandroid' || agent === 'wxapple'">不支持在微信内下载安装
                     </button>
 
                     <button type="button" v-else-if="wrong">{{ msg }}</button>
diff --git a/fir_ser/api/utils/serializer.py b/fir_ser/api/utils/serializer.py
index 51e2a95..fb77297 100644
--- a/fir_ser/api/utils/serializer.py
+++ b/fir_ser/api/utils/serializer.py
@@ -103,7 +103,7 @@ class AppsShortSerializer(serializers.ModelSerializer):
         if obj.has_combo:
             obj.has_combo.has_combo = None
             if obj.has_combo.isshow:
-                return AppsSerializer(obj.has_combo, context=self.context).data
+                return AppsShortSerializer(obj.has_combo, context=self.context).data
 
     master_release = serializers.SerializerMethodField()