diff --git a/admin/src/app/assets/images/setting/app-authorize1.png b/admin/src/app/assets/images/setting/app-authorize1.png new file mode 100644 index 000000000..b7901374f Binary files /dev/null and b/admin/src/app/assets/images/setting/app-authorize1.png differ diff --git a/admin/src/app/lang/zh-cn/channel.weapp.code.json b/admin/src/app/lang/zh-cn/channel.weapp.code.json index c32ec7e1c..24d9324b3 100644 --- a/admin/src/app/lang/zh-cn/channel.weapp.code.json +++ b/admin/src/app/lang/zh-cn/channel.weapp.code.json @@ -35,5 +35,8 @@ "toBind": "绑定授权", "toNiucloud": "去niucloud官网", "failReason": "失败原因:", - "toSetting": "去配置" + "toSetting": "去配置", + "cloudRelease": "一键云端发布", + "localRelease": "本地发布", + "localInsertTips": "请先将uni-app编译成微信小程序,然后使用微信开发者工具进行上传" } \ No newline at end of file diff --git a/admin/src/app/lang/zh-cn/channel.weapp.config.json b/admin/src/app/lang/zh-cn/channel.weapp.config.json index 9a3d046ef..cbc531796 100644 --- a/admin/src/app/lang/zh-cn/channel.weapp.config.json +++ b/admin/src/app/lang/zh-cn/channel.weapp.config.json @@ -33,5 +33,6 @@ "safeModeTips": "安全模式下,消息包为纯密文,需要开发者加密和解密,安全系数高", "weappUpload": "小程序代码上传", "uploadKey": "上传密钥", - "uploadKeyTips": "配置之后可实现在线上传小程序版本" + "uploadKeyTips": "配置之后可实现在线上传小程序版本", + "uploadIpTips": "如果小程序代码上传开启了ip白名单设置,在ip白名单中添加ip:" } \ No newline at end of file diff --git a/admin/src/app/views/app/authorize.vue b/admin/src/app/views/app/authorize.vue index 78fcc60af..80961283f 100644 --- a/admin/src/app/views/app/authorize.vue +++ b/admin/src/app/views/app/authorize.vue @@ -1,128 +1,75 @@ @@ -137,6 +84,26 @@ import { useRoute } from "vue-router"; const route = useRoute(); const pageName = route.meta.title; +let getAuthCodeDialog = ref(null); +let authCodeApproveDialog = ref(false); +let isCheck = ref(false); + +const hideAuthCode = (res)=>{ + let authCode = JSON.parse(JSON.stringify(res)); + let data = authCode.slice(0, authCode.length/2) + authCode.slice(authCode.length/2, authCode.length-1).replace(/./g, '*') + return data +} + +const authCodeApproveFn = ()=>{ + authCodeApproveDialog.value = true; + authinfo.value = ""; +} + +const closeAuthCodeApproveDialogFn = ()=>{ + loading.value = true; + checkAppMange(); +} + const authinfo = ref(""); const loading = ref(true); const saveLoading = ref(false); @@ -146,10 +113,12 @@ const checkAppMange = () => { loading.value = false; if (res.data.data && res.data.data.length != 0) { authinfo.value = res.data.data; + authCodeApproveDialog.value = false; } }) .catch(() => { loading.value = false; + authCodeApproveDialog.value = false; }); }; checkAppMange(); @@ -192,20 +161,15 @@ const save = async (formEl: FormInstance | undefined) => { }) .catch(() => { saveLoading.value = false; + authCodeApproveDialog.value = false; }); } }); }; -const authEvent = () => { - authinfo.value = ""; -}; - const market = () => { window.open("https://www.niucloud.com/product"); }; - -const visible = ref(false) + diff --git a/admin/src/app/views/app/store.vue b/admin/src/app/views/app/store.vue index e1acc4660..f60bf9276 100644 --- a/admin/src/app/views/app/store.vue +++ b/admin/src/app/views/app/store.vue @@ -306,11 +306,11 @@ :show-log-time="true" />
+ -
+
-
@@ -331,6 +331,7 @@ const activeName = ref('installed') const loading = ref(false) const showType = ref('large') const downloading = ref('') +const installAfterTips = ref([]) const downEvent = (param: Record) => { if (downloading.value) return @@ -422,8 +423,6 @@ const installShowDialog = ref(false) const installStep = ref(1) // 安装检测结果 const installCheckResult = ref({}) -// 安装警告 -const installWarning = ref([]) /** * 安装 @@ -431,9 +430,9 @@ const installWarning = ref([]) */ const installAddonFn = (key: string) => { currAddon.value = key - installStep.value = 1 - installWarning.value = [] + installStep.value = 3 installShowDialog.value = true + installAfterTips.value = [] preInstallCheck(key).then(res => { installCheckResult.value = res.data @@ -500,6 +499,7 @@ const handleInstall = () => { installStep.value = 3 localListFn() localInstalling.value = false + if (res.data.length) installAfterTips.value = res.data }).catch((res) => { localInstalling.value = false }) diff --git a/admin/src/app/views/channel/weapp/code.vue b/admin/src/app/views/channel/weapp/code.vue index 0dde4316f..c80abe4c6 100644 --- a/admin/src/app/views/channel/weapp/code.vue +++ b/admin/src/app/views/channel/weapp/code.vue @@ -18,7 +18,8 @@
- {{ t('codeDownTwoDesc') }} + {{ t('cloudRelease') }} + {{ t('localRelease') }}