Merge remote-tracking branch 'origin/develop' into develop

# Conflicts:
#	.gitlab-ci.yml

.gitlab-ci.yml

@@ -13,11 +13,9 @@ variables:
   ACR_EE_INSTANCE_ID: cri-yhk5zgfc2v1sia6l
   ACR_EE_IMAGE: h5
   ACR_EE_TAG: $CI_COMMIT_SHA
-
   JAVA_VERSION: '8'
   GITLAB_URL: https://oauth2:MjVJKxB7m4tCy7symBzn@git.mmcuav.cn/iuav/h5.git
 
-
 docker_build_dev:
   stage: dockerbuild
   variables:

env/.env.development

 # 请求接口地址
-#VITE_REQUEST_BASE_URL='https://www.iuav.shop'
-VITE_REQUEST_BASE_URL='https://test.iuav.shop'
+#VITE_REQUEST_BASE_URL='https://www.iuav.com'
+VITE_REQUEST_BASE_URL='https://test.iuav.com'

env/.env.production

 # 请求接口地址
-VITE_REQUEST_BASE_URL='https://www.iuav.shop'
-#VITE_REQUEST_BASE_URL='https://test.iuav.shop'
+VITE_REQUEST_BASE_URL='https://www.iuav.com'
+#VITE_REQUEST_BASE_URL='https://test.iuav.com'
 #VITE_REQUEST_BASE_URL='http://119.23.248.181'
 #VITE_REQUEST_BASE_URL='http://120.77.145.47'

src/pages/electronic-contracting/index.vue

@@ -3,7 +3,7 @@
 <template>
   <view class="electronic-contracting">
     <image
-      src="http://pad-video-x.oss-cn-shenzhen.aliyuncs.com/file/36396951-5948-430e-9a34-9cc8694d8408.png"
+      src="http://share-fly.oss-cn-hangzhou.aliyuncs.com/file/36396951-5948-430e-9a34-9cc8694d8408.png"
       mode="widthFix"
     />
   </view>

src/pages/index/index.vue

@@ -190,7 +190,7 @@ import weChatSDK from 'z-weixin-ts'
         currentItem: {},
 				icon: {
 					type: 'image',
-					image: 'https://pad-video-x.oss-cn-shenzhen.aliyuncs.com/file/b0364bd1-f193-4b93-ac9f-cfb6e2624d6b.png',
+					image: 'https://share-fly.oss-cn-hangzhou.aliyuncs.com/file/b0364bd1-f193-4b93-ac9f-cfb6e2624d6b.png',
 					size: [32, 32],
 					anchor: 'bottom-center',
 				},