From 6d3fe11b179eaa0381c8dca19cc861273e33841c Mon Sep 17 00:00:00 2001
From: sin <2943460818@qq.com>
Date: Wed, 10 Apr 2019 20:45:44 +0800
Subject: [PATCH] =?UTF-8?q?-=20=E4=BC=98=E5=8C=96=20productcard.vue=20?=
 =?UTF-8?q?=E5=9B=BE=E7=89=87url=E5=8F=96=E5=BE=97=E6=98=AF=20array=20-=20?=
 =?UTF-8?q?=E8=AE=A2=E5=8D=95url=E5=9C=B0=E5=9D=80=E9=80=89=E6=8B=A9=20?=
 =?UTF-8?q?=E6=9C=AA=E5=AE=8C=E6=88=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 mobile-web/src/api/user.js                       | 11 +++++------
 mobile-web/src/components/common/productcard.vue |  2 +-
 mobile-web/src/config/request.js                 |  2 +-
 mobile-web/src/page/eventBus.js                  |  6 ++++++
 mobile-web/src/page/shipping/order.vue           | 13 +++++++++++--
 mobile-web/src/page/user/address/edit.vue        |  2 +-
 mobile-web/src/page/user/address/list.vue        |  7 +++++--
 7 files changed, 30 insertions(+), 13 deletions(-)
 create mode 100644 mobile-web/src/page/eventBus.js

diff --git a/mobile-web/src/api/user.js b/mobile-web/src/api/user.js
index d4c18b37b..2fd7d250a 100644
--- a/mobile-web/src/api/user.js
+++ b/mobile-web/src/api/user.js
@@ -18,14 +18,14 @@ export function DelFavorite(id){
 
 export function GetAddressList(){
   return request({
-    url: '/user-api/user/address/list',
+    url: '/user-api/users/address/list',
     method: 'get',
   })
 }
 
 export function GetAddressById(id){
   return request({
-    url: '/user-api/user/address/address',
+    url: '/user-api/users/address/address',
     method: 'get',
     params: { id }
   })
@@ -33,7 +33,7 @@ export function GetAddressById(id){
 
 export function UpdateAddress(data){
   return request({
-    url: '/user-api/user/address/update',
+    url: '/user-api/users/address/update',
     method: 'PUT',
     params: data
   })
@@ -41,7 +41,7 @@ export function UpdateAddress(data){
 
 export function SaveAddress(data){
   return request({
-    url: '/user-api/user/address/add',
+    url: '/user-api/users/address/add',
     method: 'POST',
     params: data
   })
@@ -49,13 +49,12 @@ export function SaveAddress(data){
 
 export function DelAddress(data){
   return request({
-    url: '/user-api/user/address/remove',
+    url: '/user-api/users/address/remove',
     method: 'DELETE',
     params: data
   })
 }
 
-
 export function GetCoupon(data){
   return request({
     url: '/User/GetCoupon',
diff --git a/mobile-web/src/components/common/productcard.vue b/mobile-web/src/components/common/productcard.vue
index 131b8d3e2..bc30f6b23 100644
--- a/mobile-web/src/components/common/productcard.vue
+++ b/mobile-web/src/components/common/productcard.vue
@@ -8,7 +8,7 @@
                     style="background:#fff"
             >
                 <template slot="thumb">
-                    <img :src="product.picUrls[0]"/>
+                    <img :src="product.picUrl"/>
                     <p v-if="product.imageTag!=null&&product.imageTag!=''" class="image_tag">{{product.imageTag}}</p>
                 </template>
                 <template slot="tags">
diff --git a/mobile-web/src/config/request.js b/mobile-web/src/config/request.js
index 33b0b4acc..6bdbe764f 100644
--- a/mobile-web/src/config/request.js
+++ b/mobile-web/src/config/request.js
@@ -32,7 +32,7 @@ const serviceRouter = function(requestUrl) {
     const configProd = {
       '/order-api': {
         prefix: '/order-api',
-        target: 'http://api.shop.iocoder.cn:18099/order-api',
+        target: 'http://api.shop.iocoder.cn:18088/order-api',
       },
       '/user-api': {
         prefix: '/user-api',
diff --git a/mobile-web/src/page/eventBus.js b/mobile-web/src/page/eventBus.js
new file mode 100644
index 000000000..e20b06a18
--- /dev/null
+++ b/mobile-web/src/page/eventBus.js
@@ -0,0 +1,6 @@
+import Vue from 'vue'
+
+/**
+ * 定义空的vue实例，作为 eventbus实现非父子组件之间的通信(vue2.x中去掉了broadcast)
+ */
+export default new Vue({});
diff --git a/mobile-web/src/page/shipping/order.vue b/mobile-web/src/page/shipping/order.vue
index 766ef3f8d..0b48584b8 100644
--- a/mobile-web/src/page/shipping/order.vue
+++ b/mobile-web/src/page/shipping/order.vue
@@ -57,6 +57,7 @@
 <script>
 
   import {createOrder} from '../../api/order';
+  import eventBus from '../eventBus';
 
   export default {
     data() {
@@ -122,10 +123,18 @@
 
 
     activated() {
+
+      console.log('activated')
       //根据key名获取传递回来的参数，data就是map
-      this.$on('selectAddress', function (data) {
+      // eventBus.$on('selectaddress', function(data){
+      //   //赋值给首页的附近医院数据模型
+      //   console.log('selectaddress', data);
+      // }.bind(this));
+
+      //根据key名获取传递回来的参数，data就是map
+      this.$on('selectaddress', function (data) {
         //赋值给首页的附近医院数据模型
-        console.log(1);
+        console.log('selectaddress', data);
       }.bind(this));
     },
   };
diff --git a/mobile-web/src/page/user/address/edit.vue b/mobile-web/src/page/user/address/edit.vue
index 7c62f04d1..1c15fae39 100644
--- a/mobile-web/src/page/user/address/edit.vue
+++ b/mobile-web/src/page/user/address/edit.vue
@@ -45,7 +45,7 @@
           hasDefault: data.isDefault,
         };
 
-        if (data.id !== 0) {
+        if (data.id) {
           UpdateAddress(params).then(response => {
             this.$toast('更新成功');
             this.$router.go(-1);
diff --git a/mobile-web/src/page/user/address/list.vue b/mobile-web/src/page/user/address/list.vue
index 843140b96..f3cc4f3d8 100644
--- a/mobile-web/src/page/user/address/list.vue
+++ b/mobile-web/src/page/user/address/list.vue
@@ -16,7 +16,8 @@
 <script>
 
   import {GetAddressList} from "../../../api/user.js";
-  import {AddressList} from 'vant';
+  import { AddressList } from 'vant';
+  import eventBus from '../../eventBus';
 
   export default {
     components: {
@@ -42,7 +43,9 @@
         if (!this.isSelect) {
           return;
         }
-        this.$emit('selectAddress', item);
+        this.$emit('selectaddress', item);
+        //传递一个map，choiceHospital是key，hospital是value
+        // eventBus.$emit('selectaddress',item);
         this.$router.go(-1);
       }
     },