Merge branch 'master' of http://192.168.1.26:3000/dianliang/dl_uniapp

pages/mine/card/card-detail.vue

@@ -80,6 +80,11 @@
 						limit="9"></uni-file-picker>
 				</view>
 			</view>
+      <!-- 提示窗示例 -->
+      <uni-popup ref="alertDialog" type="dialog">
+        <uni-popup-dialog cancelText="取消" confirmText="创建" iconPath="/static/detail/card.png"
+                          content="没有可选择的收货地址，请先创建" @confirm="dialogConfirm" @close="dialogClose"></uni-popup-dialog>
+      </uni-popup>
 			<view class="item-field" style="align-items: center;">
 				<view class="submit-box" @click="submitForm">提交</view>
 			</view>
@@ -141,6 +146,13 @@
 		},
 
 		methods: {
+      dialogConfirm(){
+        this.$tab.navigateTo('/pages/mine/addr/addr-list')
+      },
+
+      dialogClose(){
+
+      },
 
 			/**初始化数据*/
 			initData(id) {
@@ -201,6 +213,9 @@
 			initAddress() {
 				uniSelectList().then(res => {
 					this.addressList = res.data
+          if (this.addressList.length == 0){
+            this.$refs.alertDialog.open()
+          }
 				}).catch((e) => {
 					uni.showToast({
 						icon: 'error',