Merge branch 'dev' of https://github.com/linlinjava/litemall

docker/litemall/application.yml

@@ -5,7 +5,7 @@ spring:
     encoding: UTF-8
   datasource:
     druid:
-      url:  jdbc:mysql://mysql:3306/litemall?useUnicode=true&characterEncoding=UTF-8&serverTimezone=UTC&allowPublicKeyRetrieval=true&verifyServerCertificate=false&useSSL=false
+      url:  jdbc:mysql://mysql:3306/litemall?useUnicode=true&characterEncoding=UTF-8&serverTimezone=UTC&allowPublicKeyRetrieval=true&verifyServerCertificate=false&useSSL=true
       driver-class-name:  com.mysql.jdbc.Driver
       username:  litemall
       password:  litemall123456

litemall-vue/src/views/user/module-address/index.vue

@@ -1,6 +1,5 @@
 <template>
   <div>
-    <van-nav-bar title="收货地址" left-text="返回" left-arrow @click-left="goback"/>
     <van-address-list v-model="chosenAddressId" :list="addressList" @add="onAdd" @edit="onEdit" @select="onSelect"/>
   </div>
 </template>