Merge branch 'master' of git.huaml.com:zhh/front-end

ghsApp/src/admin/home/me.vue

@@ -76,27 +76,6 @@
           </view>
         </template>
 
-        <view v-if="myInfo.lifelong == 0 && showDeadline" class="renew-promo-banner" @click="goRenew(0)" >
-          <view class="renew-promo-inner">
-            <view class="renew-promo-left">
-              <view class="renew-promo-badge">
-                <text class="renew-promo-badge-text">热抢</text>
-              </view>
-              <view class="renew-promo-copy">
-                <view class="renew-promo-line1">
-                  <text class="renew-promo-line1-em">限时抢购</text>
-                  <text class="renew-promo-line1-rest">终身买断</text>
-                </view>
-                <text class="renew-promo-line2">单店多店 · 多档可选 · 尊享福利</text>
-              </view>
-            </view>
-            <view class="renew-promo-action">
-              <text class="renew-promo-action-text">立即查看</text>
-              <text class="iconfont iconxiangyou renew-promo-action-icon"></text>
-            </view>
-          </view>
-        </view>
-
         <view class="content_box" v-if="myInfo.showAd && myInfo.showAd==1" style="margin-top: 20upx; padding: 20upx; text-align: center; color: #ff5722; font-size:35upx; font-weight: bold;">
           介绍一家批发店使用销花宝，得790元现金
         </view>

ghsApp/src/admin/home/workbench.vue

@@ -1211,6 +1211,7 @@ export default {
 	align-items: center;
 	justify-content: center;
 	border-radius: 24upx;
+	overflow: hidden;
 	background: #fff;
 	box-shadow: 0 10upx 28upx rgba(51, 133, 255, 0.14);
 }
@@ -1219,6 +1220,7 @@ export default {
 	width: 96upx;
 	height: 96upx;
 	display: block;
+	border-radius: 24upx;
 }
 
 .guest-brand-name {

ghsApp/src/admin/shop/renew.vue

@@ -541,7 +541,7 @@ export default {
 
 .pkg-year-section-title {
     display: block;
-    font-size: 28upx;
+    font-size: 32upx;
     font-weight: 600;
     color: #64748b;
     text-align: center;

ghsApp/src/manifest.json

@@ -2,8 +2,8 @@
     "name" : "销花宝",
     "appid" : "__UNI__BD781B0",
     "description" : "鲜花批发销售管理系统",
-    "versionName" : "1.3.02",
-    "versionCode" : 1302,
+    "versionName" : "1.3.05",
+    "versionCode" : 1305,
     "transformPx" : true,
     /* 5+App特有相关 */
     "app-plus" : {
@@ -34,7 +34,6 @@
         "distribute" : {
             /* android打包配置 */
             "android" : {
-                "pushRegisterMode" : "manual",
                 "permissions" : [
                     "<uses-permission android:name=\"android.permission.CALL_PHONE\"/>",
                     "<uses-permission android:name=\"android.permission.CAMERA\"/>"
@@ -49,12 +48,11 @@
                     "request" : "none",
                     "prompt" : "为保证您正常和安全地使用，需要获取设备识别码（部分手机提示为获取手机号码）使用权限，请允许。"
                 },
-                "targetSdkVersion" : 33,
+                "targetSdkVersion" : 30,
                 "minSdkVersion" : 21
             },
             /* ios打包配置 */
             "ios" : {
-                "pushRegisterMode" : "manual",
                 "urlschemewhitelist" : [ "baidumap", "iosamap" ],
                 "privacyDescription" : {
                     "NSPhotoLibraryUsageDescription" : "该应用需要读取您的相册，以便支持您修改头像、门店图片或花材图片",

hdApp/src/manifest.json

@@ -34,7 +34,6 @@
         "distribute" : {
             /* android打包配置 */
             "android" : {
-                "pushRegisterMode" : "manual",
                 "permissions" : [
                     "<uses-permission android:name=\"android.permission.CALL_PHONE\"/>",
                     "<uses-permission android:name=\"android.permission.CAMERA\"/>",
@@ -51,12 +50,11 @@
                     "request" : "none",
                     "prompt" : "为保证您正常和安全地使用，需要获取设备识别码（部分手机提示为获取手机号码）使用权限，请允许。"
                 },
-                "targetSdkVersion" : 33,
+                "targetSdkVersion" : 30,
                 "minSdkVersion" : 21
             },
             /* ios打包配置 */
             "ios" : {
-                "pushRegisterMode" : "manual",
                 "urlschemewhitelist" : [ "baidumap", "iosamap" ],
                 "privacyDescription" : {
                     "NSPhotoLibraryUsageDescription" : "该应用需要读取您的相册，以便支持您修改头像、门店图片或花材图片",

hdApp/src/static/icons/more_button.svg

@@ -1 +1 @@
-<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1780155316023" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="2140" xmlns:xlink="http://www.w3.org/1999/xlink" width="32" height="32"><path d="M258.5 261.9h731.6c18.7 0 33.8-15.1 33.8-33.8s-15.1-33.8-33.8-33.8H258.5c-18.7 0-33.8 15.1-33.8 33.8s15.1 33.8 33.8 33.8zM60.7 167.3C27.2 167.3 0 194.5 0 228s27.2 60.7 60.7 60.7 60.7-27.2 60.7-60.7c0.1-33.5-27.1-60.7-60.7-60.7zM990.1 503.7H258.5c-18.7 0-33.8 15.1-33.8 33.8 0 18.7 15.1 33.8 33.8 33.8h731.6c18.7 0 33.8-15.1 33.8-33.8 0-18.7-15.1-33.8-33.8-33.8zM60.7 476.7C27.2 476.7 0 503.9 0 537.5c0 33.5 27.2 60.7 60.7 60.7s60.7-27.2 60.7-60.7c0.1-33.6-27.1-60.8-60.7-60.8zM990.1 813.1H258.5c-18.7 0-33.8 15.1-33.8 33.8s15.1 33.8 33.8 33.8h731.6c18.7 0 33.8-15.1 33.8-33.8s-15.1-33.8-33.8-33.8zM60.7 786.2C27.2 786.2 0 813.4 0 847c0 33.5 27.2 60.7 60.7 60.7s60.7-27.2 60.7-60.7c0.1-33.6-27.1-60.8-60.7-60.8z" fill="#09c567" p-id="2141"></path></svg>
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1780300335217" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="2705" xmlns:xlink="http://www.w3.org/1999/xlink" width="32" height="32"><path d="M68.8 180.8H960c20.5 0 37.1-16.6 37.1-37.1s-16.6-37.1-37.1-37.1H68.8c-20.5 0-37.1 16.6-37.1 37.1s16.6 37.1 37.1 37.1z m891.3 297.1H68.8c-20.5 0-37.1 16.6-37.1 37.1s16.6 37.1 37.1 37.1H960c20.5 0 37.1-16.6 37.1-37.1 0.1-20.5-16.5-37.1-37-37.1z m0 371.3H68.8c-20.5 0-37.1 16.6-37.1 37.1s16.6 37.1 37.1 37.1H960c20.5 0 37.1-16.6 37.1-37.1 0.1-20.5-16.5-37.1-37-37.1z" fill="#09c567" p-id="2706"></path></svg>

开发http/ghsApp/src/manifest.json

@@ -2,8 +2,8 @@
     "name" : "销花宝",
     "appid" : "__UNI__BD781B0",
     "description" : "鲜花批发销售管理系统",
-    "versionName" : "1.3.02",
-    "versionCode" : 1302,
+    "versionName" : "1.3.03",
+    "versionCode" : 1305,
     "transformPx" : true,
     /* 5+App特有相关 */
     "app-plus" : {
@@ -34,7 +34,6 @@
         "distribute" : {
             /* android打包配置 */
             "android" : {
-                "pushRegisterMode" : "manual",
                 "permissions" : [
                     "<uses-permission android:name=\"android.permission.CALL_PHONE\"/>",
                     "<uses-permission android:name=\"android.permission.CAMERA\"/>"
@@ -49,12 +48,11 @@
                     "request" : "none",
                     "prompt" : "为保证您正常和安全地使用，需要获取设备识别码（部分手机提示为获取手机号码）使用权限，请允许。"
                 },
-                "targetSdkVersion" : 33,
+                "targetSdkVersion" : 30,
                 "minSdkVersion" : 21
             },
             /* ios打包配置 */
             "ios" : {
-                "pushRegisterMode" : "manual",
                 "urlschemewhitelist" : [ "baidumap", "iosamap" ],
                 "privacyDescription" : {
                     "NSPhotoLibraryUsageDescription" : "该应用需要读取您的相册，以便支持您修改头像、门店图片或花材图片",

开发http/hdApp/src/manifest.json

@@ -34,7 +34,6 @@
         "distribute" : {
             /* android打包配置 */
             "android" : {
-                "pushRegisterMode" : "manual",
                 "permissions" : [
                     "<uses-permission android:name=\"android.permission.CALL_PHONE\"/>",
                     "<uses-permission android:name=\"android.permission.CAMERA\"/>",
@@ -51,12 +50,11 @@
                     "request" : "none",
                     "prompt" : "为保证您正常和安全地使用，需要获取设备识别码（部分手机提示为获取手机号码）使用权限，请允许。"
                 },
-                "targetSdkVersion" : 33,
+                "targetSdkVersion" : 30,
                 "minSdkVersion" : 21
             },
             /* ios打包配置 */
             "ios" : {
-                "pushRegisterMode" : "manual",
                 "urlschemewhitelist" : [ "baidumap", "iosamap" ],
                 "privacyDescription" : {
                     "NSPhotoLibraryUsageDescription" : "该应用需要读取您的相册，以便支持您修改头像、门店图片或花材图片",

开发https/ghsApp/src/manifest.json

@@ -2,8 +2,8 @@
     "name" : "销花宝",
     "appid" : "__UNI__BD781B0",
     "description" : "鲜花批发销售管理系统",
-    "versionName" : "1.3.02",
-    "versionCode" : 1302,
+    "versionName" : "1.3.05",
+    "versionCode" : 1305,
     "transformPx" : true,
     /* 5+App特有相关 */
     "app-plus" : {
@@ -34,7 +34,6 @@
         "distribute" : {
             /* android打包配置 */
             "android" : {
-                "pushRegisterMode" : "manual",
                 "permissions" : [
                     "<uses-permission android:name=\"android.permission.CALL_PHONE\"/>",
                     "<uses-permission android:name=\"android.permission.CAMERA\"/>"
@@ -49,12 +48,11 @@
                     "request" : "none",
                     "prompt" : "为保证您正常和安全地使用，需要获取设备识别码（部分手机提示为获取手机号码）使用权限，请允许。"
                 },
-                "targetSdkVersion" : 33,
+                "targetSdkVersion" : 30,
                 "minSdkVersion" : 21
             },
             /* ios打包配置 */
             "ios" : {
-                "pushRegisterMode" : "manual",
                 "urlschemewhitelist" : [ "baidumap", "iosamap" ],
                 "privacyDescription" : {
                     "NSPhotoLibraryUsageDescription" : "该应用需要读取您的相册，以便支持您修改头像、门店图片或花材图片",

开发https/hdApp/src/manifest.json

@@ -34,7 +34,6 @@
         "distribute" : {
             /* android打包配置 */
             "android" : {
-                "pushRegisterMode" : "manual",
                 "permissions" : [
                     "<uses-permission android:name=\"android.permission.CALL_PHONE\"/>",
                     "<uses-permission android:name=\"android.permission.CAMERA\"/>",
@@ -51,12 +50,11 @@
                     "request" : "none",
                     "prompt" : "为保证您正常和安全地使用，需要获取设备识别码（部分手机提示为获取手机号码）使用权限，请允许。"
                 },
-                "targetSdkVersion" : 33,
+                "targetSdkVersion" : 30,
                 "minSdkVersion" : 21
             },
             /* ios打包配置 */
             "ios" : {
-                "pushRegisterMode" : "manual",
                 "urlschemewhitelist" : [ "baidumap", "iosamap" ],
                 "privacyDescription" : {
                     "NSPhotoLibraryUsageDescription" : "该应用需要读取您的相册，以便支持您修改头像、门店图片或花材图片",

线上/ghsApp/src/manifest.json

@@ -2,8 +2,8 @@
     "name" : "销花宝",
     "appid" : "__UNI__BD781B0",
     "description" : "鲜花批发销售管理系统",
-    "versionName" : "1.3.02",
-    "versionCode" : 1302,
+    "versionName" : "1.3.05",
+    "versionCode" : 1305,
     "transformPx" : true,
     /* 5+App特有相关 */
     "app-plus" : {
@@ -34,7 +34,6 @@
         "distribute" : {
             /* android打包配置 */
             "android" : {
-                "pushRegisterMode" : "manual",
                 "permissions" : [
                     "<uses-permission android:name=\"android.permission.CALL_PHONE\"/>",
                     "<uses-permission android:name=\"android.permission.CAMERA\"/>"
@@ -49,12 +48,11 @@
                     "request" : "none",
                     "prompt" : "为保证您正常和安全地使用，需要获取设备识别码（部分手机提示为获取手机号码）使用权限，请允许。"
                 },
-                "targetSdkVersion" : 33,
+                "targetSdkVersion" : 30,
                 "minSdkVersion" : 21
             },
             /* ios打包配置 */
             "ios" : {
-                "pushRegisterMode" : "manual",
                 "urlschemewhitelist" : [ "baidumap", "iosamap" ],
                 "privacyDescription" : {
                     "NSPhotoLibraryUsageDescription" : "该应用需要读取您的相册，以便支持您修改头像、门店图片或花材图片",

线上/hdApp/src/manifest.json

@@ -34,7 +34,6 @@
         "distribute" : {
             /* android打包配置 */
             "android" : {
-                "pushRegisterMode" : "manual",
                 "permissions" : [
                     "<uses-permission android:name=\"android.permission.CALL_PHONE\"/>",
                     "<uses-permission android:name=\"android.permission.CAMERA\"/>",
@@ -51,12 +50,11 @@
                     "request" : "none",
                     "prompt" : "为保证您正常和安全地使用，需要获取设备识别码（部分手机提示为获取手机号码）使用权限，请允许。"
                 },
-                "targetSdkVersion" : 33,
+                "targetSdkVersion" : 30,
                 "minSdkVersion" : 21
             },
             /* ios打包配置 */
             "ios" : {
-                "pushRegisterMode" : "manual",
                 "urlschemewhitelist" : [ "baidumap", "iosamap" ],
                 "privacyDescription" : {
                     "NSPhotoLibraryUsageDescription" : "该应用需要读取您的相册，以便支持您修改头像、门店图片或花材图片",