联调地址部分接口

commont/http.interceptor.js

@@ -1,50 +1,58 @@
 // 此vm参数为页面的实例，可以通过它引用vuex中的变量
 module.exports = (vm) => {
-    // 初始化请求配置
-    uni.$u.http.setConfig((config) => {
-        /* config 为默认全局配置*/
-        config.baseURL = 'https://cbec.hdlkeji.com'; /* 根域名 */
-        return config
-    })
-	
-	// 请求拦截
-	uni.$u.http.interceptors.request.use((config) => { // 可使用async await 做异步操作
-	    // 初始化请求拦截器时，会执行此方法，此时data为undefined，赋予默认{}
-	    config.data = config.data || {}
-		// 根据custom参数中配置的是否需要token，添加对应的请求头
-		// if(config?.custom?.auth) {
-			// 可以在此通过vm引用vuex中的变量，具体值在vm.$store.state中
-			const token  = localStorage.getItem('token')
-			config.header.Authorization = 'Bearer'+' '+token
-		// }
-	    return config 
-	}, config => { // 可使用async await 做异步操作
-	    return Promise.reject(config)
-	})
-	
-	// 响应拦截
-	uni.$u.http.interceptors.response.use((res) => { /* 对响应成功做点什么 可使用async await 做异步操作*/
-		const data = res.data
-		console.log(data.code);
-		// 自定义参数
-		const custom = res.config?.custom
-		if (data.code !== 10000) { 
-			// 如果没有显式定义custom的toast参数为false的话，默认对报错进行toast弹出提示
-			if (custom.toast !== false) {
-				uni.$u.toast(data.message)
-			}
+  // 初始化请求配置
+  uni.$u.http.setConfig((config) => {
+    /* config 为默认全局配置*/
+    config.baseURL = "https://cbec.hdlkeji.com"; /* 根域名 */
+    return config;
+  });
 
-			// 如果需要catch返回，则进行reject
-			if (custom?.catch) {
-				return Promise.reject(data)
-			} else {
-				// 否则返回一个pending中的promise，请求不会进入catch中
-				return new Promise(() => { })
-			}
-		}
-		return data.data === undefined ? {} : data.data
-	}, (res) => { 
-		// 对响应错误做点什么 （statusCode !== 200）
-		return Promise.reject(res.msg)
-	})
-}
+  // 请求拦截
+  uni.$u.http.interceptors.request.use(
+    (config) => {
+      // 可使用async await 做异步操作
+      // 初始化请求拦截器时，会执行此方法，此时data为undefined，赋予默认{}
+      config.data = config.data || {};
+      // 根据custom参数中配置的是否需要token，添加对应的请求头
+      // if(config?.custom?.auth) {
+      // 可以在此通过vm引用vuex中的变量，具体值在vm.$store.state中
+      const token = localStorage.getItem("token");
+      config.header.Authorization = "Bearer" + " " + token;
+      // }
+      return config;
+    },
+    (config) => {
+      // 可使用async await 做异步操作
+      return Promise.reject(config);
+    }
+  );
+
+  // 响应拦截
+  uni.$u.http.interceptors.response.use(
+    (res) => {
+      /* 对响应成功做点什么 可使用async await 做异步操作*/
+      const data = res.data;
+      // 自定义参数
+      const custom = res.config?.custom;
+      if (data.code !== 10000) {
+        // 如果没有显式定义custom的toast参数为false的话，默认对报错进行toast弹出提示
+        if (custom.toast !== false) {
+          uni.$u.toast(data.message);
+        }
+
+        // 如果需要catch返回，则进行reject
+        if (custom?.catch) {
+          return Promise.reject(data);
+        } else {
+          // 否则返回一个pending中的promise，请求不会进入catch中
+          return new Promise(() => {});
+        }
+      }
+      return data.data === undefined ? {} : data.data;
+    },
+    (res) => {
+      // 对响应错误做点什么 （statusCode !== 200）
+      return Promise.reject(res.msg);
+    }
+  );
+};

network/http.js

@@ -9,7 +9,6 @@ uni.getStorage({
     token = res.data;
   },
 });
-console.log(token);
 export const request = (option) => {
   return new Promise((resolve, reject) => {
     uni.request({

pageC/addEditAddress/addEditAddress.vue

@@ -1,182 +1,312 @@
 <template>
-	<view class="page">
-		<view class="content">
-			<view class="title">
-				<text class="title-left">{{ i18n.contacts }}</text>
-				<view class="title-right">
-					<image src="../../static/mine/331.png" class="title-icon" mode=""></image>
-					<text>{{ i18n.wxAddress }}</text>
-				</view>
-			</view>
-			<!-- 注意，如果需要兼容微信小程序，最好通过setRules方法设置rules规则 -->
-			<u--form labelPosition="left" :model="model1" ref="uForm">
-				<u-form-item labelWidth="150rpx" :label="i18n.name"  borderBottom ref="item1">
-					<u--input v-model="model1.userInfo.name" :placeholder="i18n.goods" border="none"></u--input>
-				</u-form-item>
+  <view class="page">
+    <view class="content">
+      <view class="title">
+        <text class="title-left">{{ i18n.contacts }}</text>
+        <view class="title-right">
+          <image
+            src="../../static/mine/331.png"
+            class="title-icon"
+            mode=""
+          ></image>
+          <text>{{ i18n.wxAddress }}</text>
+        </view>
+      </view>
+      <!-- 注意，如果需要兼容微信小程序，最好通过setRules方法设置rules规则 -->
+      <u--form labelPosition="left" :model="model1" ref="uForm">
+        <u-form-item
+          labelWidth="150rpx"
+          :label="i18n.name"
+          borderBottom
+          ref="item1"
+        >
+          <u--input
+            v-model="model1.userInfo.name"
+            :placeholder="i18n.goods"
+            border="none"
+          ></u--input>
+        </u-form-item>
 
-				<u-form-item labelWidth="150rpx" :label="i18n.phone"  borderBottom ref="item1">
-					<u--input v-model="model1.userInfo.name" :placeholder="i18n.pleasePhoneNumber" border="none"></u--input>
-				</u-form-item>
-				<u-form-item labelWidth="150rpx" :label="i18n.city"  borderBottom
-					@click="show = true" ref="item1">
-					<u--input v-model="model1.userInfo.sex" disabled disabledColor="#ffffff" :placeholder="i18n.township"
-						border="none"></u--input>
-					<u-icon slot="right" name="arrow-right"></u-icon>
-				</u-form-item>
+        <u-form-item
+          labelWidth="150rpx"
+          :label="i18n.phone"
+          borderBottom
+          ref="item1"
+        >
+          <u--input
+            v-model="model1.userInfo.phone"
+            :placeholder="i18n.pleasePhoneNumber"
+            border="none"
+          ></u--input>
+        </u-form-item>
+        <u-form-item
+          labelWidth="150rpx"
+          :label="i18n.city"
+          borderBottom
+          @click="show = true"
+          ref="item1"
+        >
+          <u--input
+            v-model="model1.userInfo.city"
+            disabled
+            disabledColor="#ffffff"
+            :placeholder="i18n.township"
+            border="none"
+          ></u--input>
+          <u-icon slot="right" name="arrow-right"></u-icon>
+        </u-form-item>
 
-				<u-form-item labelWidth="150rpx" :label="i18n.detailed"  borderBottom ref="item1">
-					<u--input v-model="model1.userInfo.name" :placeholder="i18n.sect" border="none"></u--input>
-				</u-form-item>
-				<view class="company">
-					<u--input v-model="model1.userInfo.name" :placeholder="i18n.company" border="none"></u--input>
-				</view>
-				<view style="display: flex;justify-content: space-between;align-items: center;">
-					<view class="item-left">
-						<image src="../../static/mine/327.png" class="address-icon" mode=""></image>
-						<text>{{ i18n.initial }}</text>
-					</view>
-					<text style="font-size: 24rpx; color: #333;">{{i18n.empty}}</text>
-				</view>
-			</u--form>
+        <u-form-item
+          labelWidth="150rpx"
+          :label="i18n.detailed"
+          borderBottom
+          ref="item1"
+        >
+          <u--input
+            v-model="model1.userInfo.detailed"
+            :placeholder="i18n.sect"
+            border="none"
+          ></u--input>
+        </u-form-item>
+        <view class="company">
+          <u--input
+            v-model="model1.userInfo.company"
+            :placeholder="i18n.company"
+            border="none"
+          ></u--input>
+        </view>
+        <view
+          style="
+            display: flex;
+            justify-content: space-between;
+            align-items: center;
+          "
+        >
+          <view
+            class="item-left"
+            @click="model1.userInfo.is_default = !model1.userInfo.is_default"
+          >
+            <image
+              src="../../static/mine/327.png"
+              class="address-icon"
+              mode=""
+              v-if="!model1.userInfo.is_default"
+            ></image>
 
-		</view>
-		<SelectCity :show="show" @close="close"/>
-		<view class="footer">
-			<button class="save">{{i18n.preserve}}</button>
-		</view>
-	</view>
+            <image
+              v-else
+              src="../../static/mine/330.png"
+              class="address-icon"
+              mode=""
+            ></image>
+            <text>{{ i18n.initial }}</text>
+          </view>
+          <text style="font-size: 24rpx; color: #333">{{ i18n.empty }}</text>
+        </view>
+      </u--form>
+    </view>
+    <SelectCity :show="show" @close="close" :cityId="cityId" />
+    <view class="footer">
+      <button class="save" @click="submit">{{ i18n.preserve }}</button>
+    </view>
+  </view>
 </template>
 
 <script>
-	import SelectCity from './component/selectCity.vue';
-	export default {
-		components:{
-			SelectCity
-		},
-		computed: {
-			i18n() {
-				return this.$t('index')
-			}
-		},
-		data() {
-			return {
-				show: false,
-				model1: {
-					userInfo: {
-						name: '',
-						sex: '',
-					},
-				},
-				rules: {
-					'userInfo.name': {
-						type: 'string',
-						required: true,
-						message: '请填写姓名',
-						trigger: ['blur', 'change']
-					},
-					'userInfo.sex': {
-						type: 'string',
-						max: 1,
-						required: true,
-						message: '请选择男或女',
-						trigger: ['blur', 'change']
-					},
-				},
-			};
-		},
-		methods: {
-			sexSelect(e) {
-				this.model1.userInfo.sex = e.name
-				this.$refs.uForm.validateField('userInfo.sex')
-			},
-			close(){
-				this.show = false
-			}
-		},
-		mounted() {
-				uni.setNavigationBarTitle({
-					title:this.i18n.newAddress
-				})
-		},
-		onReady() {
-			//如果需要兼容微信小程序，并且校验规则中含有方法等，只能通过setRules方法设置规则。
-			this.$refs.uForm.setRules(this.rules)
-		},
-	};
+import SelectCity from "./component/selectCity.vue";
+export default {
+  components: {
+    SelectCity,
+  },
+  computed: {
+    i18n() {
+      return this.$t("index");
+    },
+  },
+  data() {
+    return {
+      show: false,
+      cityId: [],
+      cityPid: {},
+      addressId: "",
+      model1: {
+        userInfo: {
+          name: "",
+          sex: "",
+          phone: "",
+          city: "",
+          detailed: "",
+          company: "",
+          is_default: 0,
+          country_id: 0,
+        },
+      },
+      rules: {
+        "userInfo.name": {
+          type: "string",
+          required: true,
+          message: "请填写姓名",
+          trigger: ["blur", "change"],
+        },
+        "userInfo.sex": {
+          type: "string",
+          max: 1,
+          required: true,
+          message: "请选择男或女",
+          trigger: ["blur", "change"],
+        },
+      },
+    };
+  },
+  onLoad(options) {
+    if (options.id) {
+      this.addressId = options.id;
+      this.getAddressDetail(options.id);
+    }
+  },
+  methods: {
+    //编辑 or 新增
+    submit() {
+      const obj = {
+        mobile: this.model1.userInfo.phone,
+        name: this.model1.userInfo.name,
+        is_default: this.model1.userInfo.is_default ? 1 : 0,
+        company_name: this.model1.userInfo.company,
+        address: this.model1.userInfo.detailed,
+        country_id: this.model1.userInfo.country_id,
+      };
+      //有id为编辑，没有id为新增
+      if (this.addressId) {
+        uni.$u.http
+          .put(`/api/address/${this.addressId}`, { ...obj, ...this.cityPid })
+          .then((res) => {
+            console.log(res);
+            this.$router.back();
+          })
+          .catch(() => {});
+      } else {
+        uni.$u.http
+          .post(`/api/address`, { ...obj, ...this.cityPid })
+          .then((res) => {
+            console.log(res);
+            this.$router.back();
+          })
+          .catch(() => {});
+      }
+    },
+    //关闭选择城市弹窗
+    close(obj) {
+      this.show = false;
+      if (obj && obj.name) {
+        this.model1.userInfo.city =
+          obj.name + obj.children.name + obj.children.children.name;
+        this.cityId = [obj.id, obj.children.id, obj.children.children.id];
+        this.cityPid.province_id = obj.id;
+        this.cityPid.city_id = obj.children.id;
+        this.cityPid.area_id = obj.children.children.id;
+      }
+    },
+    //回显数据
+    getAddressDetail(id) {
+      uni.$u.http.get(`/api/address/${id}`).then((res) => {
+        this.model1.userInfo.city =
+          res.province_name + res.city_name + res.area_name;
+        this.model1.userInfo.name = res.name;
+        this.model1.userInfo.phone = res.mobile;
+        this.model1.userInfo.detailed = res.address;
+        this.model1.userInfo.company = res.company_name;
+        this.model1.userInfo.is_default = res.is_default;
+        this.model1.userInfo.country_id = res.country_id;
+        if (res.province_id && res.city_id && res.area_id) {
+          this.cityId = [res.province_id, res.city_id, res.area_id];
+        }
+      });
+    },
+  },
+  mounted() {
+    uni.setNavigationBarTitle({
+      title: this.i18n.newAddress,
+    });
+  },
+  onReady() {
+    //如果需要兼容微信小程序，并且校验规则中含有方法等，只能通过setRules方法设置规则。
+    this.$refs.uForm.setRules(this.rules);
+  },
+};
 </script>
 
 <style lang="scss" scoped>
-	.page {
-		padding: 20rpx 24rpx;
+.page {
+  padding: 20rpx 24rpx;
 
-		.content {
-			background-color: #fff;
-			border-radius: 16rpx;
-			padding: 0 24rpx;
+  .content {
+    background-color: #fff;
+    border-radius: 16rpx;
+    padding: 0 24rpx;
 
-			.title {
-				display: flex;
-				justify-content: space-between;
-				align-items: center;
-				height: 100rpx;
-				border-bottom: 2rpx solid rgba(151, 151, 151, .1);
+    .title {
+      display: flex;
+      justify-content: space-between;
+      align-items: center;
+      height: 100rpx;
+      border-bottom: 2rpx solid rgba(151, 151, 151, 0.1);
 
-				.title-left {
-					font-size: 32rpx;
-					color: #333;
-					font-weight: 600;
-				}
+      .title-left {
+        font-size: 32rpx;
+        color: #333;
+        font-weight: 600;
+      }
 
-				.title-icon {
-					width: 26rpx;
-					height: 26rpx;
-					margin-right: 10rpx;
-				}
+      .title-icon {
+        width: 26rpx;
+        height: 26rpx;
+        margin-right: 10rpx;
+      }
 
-				.title-right {
-					display: flex;
-					align-items: center;
-					font-size: 24rpx;
-					color: rgba(51, 51, 51, .6);
-				}
-			}
+      .title-right {
+        display: flex;
+        align-items: center;
+        font-size: 24rpx;
+        color: rgba(51, 51, 51, 0.6);
+      }
+    }
 
-			.company {
-				height: 102rpx;
-				display: flex;
-				align-items: center;
-				border-bottom: 2rpx solid rgba(151, 151, 151, .1);
-			}
-		}
+    .company {
+      height: 102rpx;
+      display: flex;
+      align-items: center;
+      border-bottom: 2rpx solid rgba(151, 151, 151, 0.1);
+    }
+  }
 
-		.item-left {
-			font-size: 24rpx;
-			color: #333;
-			display: flex;
-			align-items: center;
-			height: 86rpx;
+  .item-left {
+    font-size: 24rpx;
+    color: #333;
+    display: flex;
+    align-items: center;
+    height: 86rpx;
 
-			.address-icon {
-				width: 26rpx;
-				height: 26rpx;
-				margin-right: 10rpx;
-			}
-		}
-		.footer{
-			background-color: #fff;
-			position: fixed;
-			bottom: 0;
-			height: 146rpx;
-			width: 750rpx;
-			left: 0;
-			padding-top: 20rpx;
-			.save{
-				width: 702rpx;
-				margin: 0 auto;
-				background-color: #f83224;
-				color: #fff;
-				border-radius: 40rpx;
-			}
-		}
-	}
-</style>
+    .address-icon {
+      width: 26rpx;
+      height: 26rpx;
+      margin-right: 10rpx;
+    }
+  }
+  .footer {
+    background-color: #fff;
+    position: fixed;
+    bottom: 0;
+    height: 146rpx;
+    width: 750rpx;
+    left: 0;
+    padding-top: 20rpx;
+    .save {
+      width: 702rpx;
+      margin: 0 auto;
+      background-color: #f83224;
+      color: #fff;
+      border-radius: 40rpx;
+    }
+  }
+}
+</style>

pageC/addEditAddress/component/selectCity.vue

@@ -1,157 +1,237 @@
 <template>
-	<view class="">
-		<u-popup :show="show" mode="bottom" @close="$emit('close')" :round="10" :closeable="true">
-			<view style="height: 100rpx;line-height: 100rpx;
-			text-align: center;font-size: 36rpx;color: #222;">
-				选择省市区
-			</view>
-			<view>
-				<input type="text" class="inp" />
-				<view class="title">
-					热门城市
-				</view>
-				<view class="city-list">
-					<view class="city" v-for="(item,index) in cityList" :key="index">
-						{{item}}
-					</view>
-				</view>
-				<picker-view class="picker-view" :indicator-style="indicatorStyle" :value="value" @change="bindChange"
-					:mask-top-style="maskTopStyle" :mask-bottom-style="maskBottomStyle">
-					<picker-view-column class="picker-view-column">
-						<view class="item" v-for="(item,index) in years" :key="index"><text
-								class="text">{{item}}年</text></view>
-					</picker-view-column>
-					<picker-view-column class="picker-view-column">
-						<view class="item" v-for="(item,index) in months" :key="index"><text
-								class="text">{{item}}月</text>
-						</view>
-					</picker-view-column>
-					<picker-view-column class="picker-view-column">
-						<view class="item" v-for="(item,index) in days" :key="index"><text class="text">{{item}}日</text>
-						</view>
-					</picker-view-column>
-				</picker-view>
-				<button @click="$emit('close')" class="confirm">确定</button>
-			</view>
-		</u-popup>
-	</view>
+  <view class="">
+    <u-popup
+      :show="show"
+      mode="bottom"
+      @close="$emit('close')"
+      :round="10"
+      :closeable="true"
+      @open="open"
+    >
+      <view
+        style="
+          height: 100rpx;
+          line-height: 100rpx;
+          text-align: center;
+          font-size: 36rpx;
+          color: #222;
+        "
+      >
+        选择省市区
+      </view>
+      <view>
+        <input type="text" class="inp" disabled />
+        <view class="title"> 热门城市 </view>
+        <view class="city-list">
+          <view class="city" v-for="(item, index) in hotCityList" :key="index">
+            {{ item }}
+          </view>
+        </view>
+        <picker-view
+          class="picker-view"
+          :indicator-style="indicatorStyle"
+          :value="value"
+          @change="bindChange"
+          :mask-top-style="maskTopStyle"
+          :mask-bottom-style="maskBottomStyle"
+        >
+          <picker-view-column class="picker-view-column">
+            <view class="item" v-for="(item, index) in cityList" :key="index"
+              ><text class="text">{{ item.name }}</text></view
+            >
+          </picker-view-column>
+          <picker-view-column class="picker-view-column">
+            <view class="item" v-for="(item, index) in marketList" :key="index"
+              ><text class="text">{{ item.name }}</text>
+            </view>
+          </picker-view-column>
+          <picker-view-column class="picker-view-column">
+            <view
+              class="item"
+              v-for="(item, index) in distinguishList"
+              :key="index"
+              ><text class="text">{{ item.name }}</text>
+            </view>
+          </picker-view-column>
+        </picker-view>
+        <button @click="submit" class="confirm">确定</button>
+      </view>
+    </u-popup>
+  </view>
 </template>
 
 <script>
-	export default {
-		props: {
-			show: {
-				typeof: Boolean,
-				default: false
-			}
-		},
-		data() {
-			const date = new Date()
-			const years = []
-			const _year = date.getFullYear()
-			const _months = []
-			const _month = date.getMonth() + 1
-			const _days = []
-			const day1 = date.getDate()
-			for (let i = 2000; i <= _year; i++) {
-				years.push(i)
-			}
-			for (let i = 1; i <= 12; i++) {
-				_months.push(i)
-			}
-			for (let i = 1; i <= 31; i++) {
-				_days.push(i)
-			}
-			return {
-				cityList: ['北京', '上海', '深圳', '广州', '天津', '青岛', '长沙', '成都'],
-				title: 'picker-view',
-				years: years,
-				year: _year,
-				months: _months,
-				month: _month,
-				days: _days,
-				day: day1,
-				value: [_year - 2000, _month - 1, day1 - 1],
-				result: [],
-				indicatorStyle: 'height: 50px;',
-				maskTopStyle: '',
-				maskBottomStyle: ''
-			}
-		},
-		methods: {
-			bindChange(e) {
-				const val = e.detail.value
-				this.result = val
-				this.year = this.years[val[0]]
-				this.month = this.months[val[1]]
-				this.day = this.days[val[2]]
-			},
-			setValue() {
-				this.value = [0, 0, 0]
-			},
-			setValue1() {
-				this.value = [10, 10, 10]
-			},
-		},
-	}
+export default {
+  props: {
+    show: {
+      typeof: Boolean,
+      default: false,
+    },
+    cityId: {
+      typeof: Array,
+      default: () => {
+        return [];
+      },
+    },
+    countryId: {
+      typeof: String,
+      default: "100000",
+    },
+  },
+  watch: {
+    cityId(newVal) {
+      if (newVal.length == 3) {
+        this.cityList.forEach((item, index) => {
+          if (item.pid == newVal[0]) {
+            this.value.push(index);
+            item.children.forEach((items, indexs) => {
+              if (items.pid == newVal[1]) {
+                this.value.push(indexs);
+                items.children.forEach((elem, i) => {
+                  if (elem.pid == newVal[2]) {
+                    this.value.push(i);
+                  }
+                });
+              }
+            });
+          }
+        });
+      } else {
+        this.value = [0, 0, 0];
+      }
+    },
+    countryId(newVal) {
+      if (newVal != "100000") {
+        this.getCityList();
+      }
+    },
+  },
+
+  data() {
+    return {
+      hotCityList: [
+        "北京",
+        "上海",
+        "深圳",
+        "广州",
+        "天津",
+        "青岛",
+        "长沙",
+        "成都",
+      ],
+      cityList: [],
+      title: "picker-view",
+      marketList: [],
+      distinguishList: [],
+      value: [],
+      result: [],
+      indicatorStyle: "height: 50px;",
+      maskTopStyle: "",
+      maskBottomStyle: "",
+      economize: {},
+      market: {},
+      distinguish: {},
+    };
+  },
+  mounted() {
+    // this.getCityList();
+  },
+  methods: {
+    open() {
+      console.log(111);
+      this.getCityList();
+    },
+    //当选中的城市发生变化时调用
+    bindChange(e) {
+      const val = e.detail.value;
+      this.value = val;
+      this.marketList = this.cityList[val[0]].children;
+      this.distinguishList = this.marketList[val[1] || 0].children;
+      this.economize = this.cityList[val[0]];
+      this.market = this.marketList[val[1] || 0];
+      this.distinguish = this.distinguishList[val[2] || 0];
+    },
+    //获取城市
+    getCityList() {
+      uni.$u.http.get(`/api/area/tree?pid=${this.countryId}`).then((res) => {
+        this.cityList = res;
+        if (this.countryId == "100000") {
+          this.marketList = res[0].children;
+          this.distinguishList = this.marketList[0].children;
+        }
+      });
+    },
+    //提交选中的城市
+    submit() {
+      const obj = {
+        ...this.economize,
+        children: {
+          ...this.market,
+          children: this.distinguish,
+        },
+      };
+      this.$emit("close", obj);
+    },
+  },
+};
 </script>
 
 <style lang="scss" scoped>
-	.title {
-		margin: 32rpx 26rpx;
-	}
+.title {
+  margin: 32rpx 26rpx;
+}
 
-	.inp {
-		background-color: #f4f4f4;
-		border-radius: 36rpx;
-		height: 72rpx;
-		width: 694rpx;
-		margin: 30rpx auto 0;
-		padding-left: 20rpx;
-	}
+.inp {
+  background-color: #f4f4f4;
+  border-radius: 36rpx;
+  height: 72rpx;
+  width: 694rpx;
+  margin: 30rpx auto 0;
+  padding-left: 20rpx;
+}
 
-	.city-list {
-		display: flex;
-		justify-content: space-around;
-		flex-wrap: wrap;
+.city-list {
+  display: flex;
+  justify-content: space-around;
+  flex-wrap: wrap;
 
-		.city {
-			width: 156rpx;
-			height: 68rpx;
-			text-align: center;
-			line-height: 68rpx;
-			background-color: #f4f4f4;
-			border-radius: 36rpx;
-			margin-bottom: 20rpx;
-			color: #222;
-			font-size: 28rpx;
-		}
-	}
+  .city {
+    width: 156rpx;
+    height: 68rpx;
+    text-align: center;
+    line-height: 68rpx;
+    background-color: #f4f4f4;
+    border-radius: 36rpx;
+    margin-bottom: 20rpx;
+    color: #222;
+    font-size: 28rpx;
+  }
+}
 
-	.confirm {
-		background-color: #f83224;
-		border-radius: 40rpx;
-		color: #fff;
-		width: 702rpx;
-		margin: 0 auto;
-	}
+.confirm {
+  background-color: #f83224;
+  border-radius: 40rpx;
+  color: #fff;
+  width: 702rpx;
+  margin: 0 auto;
+}
 
-	.picker-view {
-		width: 100%;
-		height: 180px;
-		margin-top: 10px;
-	}
+.picker-view {
+  width: 100%;
+  height: 180px;
+  margin-top: 10px;
+}
 
-	.item {
-		height: 50px;
-	}
+.item {
+  height: 50px;
+}
 
-	.text {
-		line-height: 50px;
-		text-align: center;
-	}
+.text {
+  line-height: 50px;
+  text-align: center;
+}
 
-	.picker-view-column {
-		text-align: center;
-	}
-</style>
+.picker-view-column {
+  text-align: center;
+}
+</style>

pageC/addressManagement/addressManagement.vue

@@ -1,175 +1,201 @@
 <template>
-	<view>
-		<view class="top-tab">
-			<view :class="{select:manage == 1}" @click="switchTab(1)">
-				{{i18n.inland}}
-			</view>
-			<view :class="{select:manage == 2}" @click="switchTab(2)">
-				{{i18n.international}}
-			</view>
-		</view>
-		<view class="content" v-if="addressList.length !=0">
-			<addressVue @deleteAddress="deleteAddress" @setDefault='setDefault' v-for="item in addressList"
-				:itemInfo="item" :key="item.id" />
-		</view>
-		<view class="" v-else>
-			空空如也
-		</view>
-		<view class="footer" v-if="manage == 1">
-			<button class="wx">{{i18n.wx}}</button>
-			<button class="add" @click="toAddRess('/pageC/addEditAddress/addEditAddress')">{{i18n.add}}</button>
-		</view>
-		<view class="footer" v-else>
-			<button class="add-international"
-				@click="toAddRess('/pageC/internationalAddress/internationalAddress')">{{i18n.add}}</button>
-		</view>
-	</view>
+  <view>
+    <view class="top-tab">
+      <view :class="{ select: manage == 1 }" @click="switchTab(1)">
+        {{ i18n.inland }}
+      </view>
+      <view :class="{ select: manage == 0 }" @click="switchTab(0)">
+        {{ i18n.international }}
+      </view>
+    </view>
+    <view class="content" v-if="addressList.length != 0">
+      <addressVue
+        @deleteAddress="deleteAddress"
+        @setDefault="setDefault"
+        @toDetail="toDetail"
+        v-for="item in addressList"
+        :itemInfo="item"
+        :key="item.id"
+      />
+    </view>
+    <view class="empty" v-else> 空空如也~ </view>
+    <view class="footer" v-if="manage == 1">
+      <button class="wx">{{ i18n.wx }}</button>
+      <button
+        class="add"
+        @click="toAddRess('/pageC/addEditAddress/addEditAddress')"
+      >
+        {{ i18n.add }}
+      </button>
+    </view>
+    <view class="footer" v-else>
+      <button
+        class="add-international"
+        @click="toAddRess('/pageC/internationalAddress/internationalAddress')"
+      >
+        {{ i18n.add }}
+      </button>
+    </view>
+  </view>
 </template>
 
 <script>
-	import addressVue from './component/address.vue'
-	export default {
-		components: {
-			addressVue
-		},
-		data() {
-			return {
-				manage: 1,
-				addressList: [{
-						name: "张三",
-						address: "临沂市兰山区长沙路与蜀河路交叉口东430米路南奥克斯·创智1号B1栋",
-						id: "1",
-						phone: "188****0000",
-						isDefault: true
-					},
-					{
-						name: "张三",
-						address: "临沂市兰山区长沙路与蜀河路交叉口东430米路南奥克斯·创智1号B1栋",
-						id: "2",
-						phone: "188****0000",
-						isDefault: false
-					},
-				]
-			}
-		},
-		computed: {
-			i18n() {
-				return this.$t('index')
-			}
-		},
-		methods: {
-			switchTab(num) {
-				this.manage = num
-			},
-			//设置默认地址
-			setDefault(value) {
-				this.addressList.forEach(item => {
-					//先将所有的地址取消默认
-					item.isDefault = false
-					//挑选出点击的地址，默认置反
-					if (item.id == value.id) {
-						item.isDefault = !item.isDefault
-					}
-				})
-			},
-			//删除地址
-			deleteAddress(value) {
-				this.addressList.forEach((item, index) => {
-					//挑选出点击的地址，删除地址
-					if (item.id == value.id) {
-						this.addressList.splice(index, 1)
-					}
-				})
-			},
-			toAddRess(url) {
-				uni.navigateTo({
-					url
-				})
-			}
-		},
-		mounted() {
-			uni.setNavigationBarTitle({
-				title: this.i18n.address
-			})
-		},
-	}
+import addressVue from "./component/address.vue";
+export default {
+  components: {
+    addressVue,
+  },
+  data() {
+    return {
+      manage: 1,
+      addressList: [],
+    };
+  },
+  computed: {
+    i18n() {
+      return this.$t("index");
+    },
+  },
+  methods: {
+    switchTab(num) {
+      this.manage = num;
+      this.getAddressList(num);
+    },
+    //设置默认地址
+    setDefault(value) {
+      uni.$u.http
+        .post(`/api/address/default/${value.id}`)
+        .then((res) => {
+          this.getAddressList(this.manage);
+        })
+        .catch(() => {});
+    },
+    //跳转地址详情页
+    toDetail(id) {
+      if (this.manage) {
+        uni.navigateTo({
+          url: `/pageC/addEditAddress/addEditAddress?id=${id}`,
+        });
+      } else {
+        uni.navigateTo({
+          url: `/pageC/internationalAddress/internationalAddress?id=${id}`,
+        });
+      }
+    },
+    //删除地址
+    deleteAddress(value) {
+      uni.$u.http.delete(`/api/address/${value.id}`).then((res) => {
+        this.getAddressList(this.manage);
+      });
+    },
+    toAddRess(url) {
+      uni.navigateTo({
+        url,
+      });
+    },
+    getAddressList(num) {
+      uni.$u.http
+        .get(
+          `/api/address?is_page=0&page=1&limit=10&is_domestic=${num}&is_default=`
+        )
+        .then((res) => {
+          this.addressList = res;
+        });
+    },
+  },
+  onShow() {
+    this.getAddressList(this.manage);
+  },
+  mounted() {
+    // this.getAddressList(1);
+    uni.setNavigationBarTitle({
+      title: this.i18n.address,
+    });
+  },
+};
 </script>
 
 <style scoped lang="scss">
-	.top-tab {
-		display: flex;
-		font-size: 32rpx;
-		color: rgba(34, 34, 34, .8);
-		justify-content: space-around;
-		background-color: #fff;
-		height: 80rpx;
-		align-items: center;
+.top-tab {
+  display: flex;
+  font-size: 32rpx;
+  color: rgba(34, 34, 34, 0.8);
+  justify-content: space-around;
+  background-color: #fff;
+  height: 80rpx;
+  align-items: center;
 
-		.select {
-			position: relative;
-			font-weight: 600;
-		}
+  .select {
+    position: relative;
+    font-weight: 600;
+  }
 
-		.select::before {
-			content: '';
-			display: block;
-			width: 50%;
-			height: 4rpx;
-			background-color: #f83224;
-			position: absolute;
-			bottom: -20rpx;
-			left: 50%;
-			transform: translate(-50%, -50%);
-		}
-	}
+  .select::before {
+    content: "";
+    display: block;
+    width: 50%;
+    height: 4rpx;
+    background-color: #f83224;
+    position: absolute;
+    bottom: -20rpx;
+    left: 50%;
+    transform: translate(-50%, -50%);
+  }
+}
 
-	.content {
-		padding: 20rpx 24rpx;
-		padding-bottom: 200rpx;
+.content {
+  padding: 20rpx 24rpx;
+  padding-bottom: 200rpx;
+}
 
-	}
+.empty {
+  font-size: 28rpx;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  color: rgba(51, 51, 51, 0.7);
+  margin-top: 200rpx;
+}
+.footer {
+  position: fixed;
+  bottom: 0;
+  background-color: #fff;
+  display: flex;
+  justify-content: space-around;
+  width: 750rpx;
+  padding: 20rpx 0 66rpx;
 
-	.footer {
-		position: fixed;
-		bottom: 0;
-		background-color: #fff;
-		display: flex;
-		justify-content: space-around;
-		width: 750rpx;
-		padding: 20rpx 0 66rpx;
+  .wx {
+    width: 338rpx;
+    background-color: #fff;
+    border-radius: 40rpx;
+    height: 80rpx;
+    font-size: 32rpx;
+    color: #222;
+    padding: 0;
+    margin: 0;
+    border: 2rpx solid #979797;
+  }
 
-		.wx {
-			width: 338rpx;
-			background-color: #fff;
-			border-radius: 40rpx;
-			height: 80rpx;
-			font-size: 32rpx;
-			color: #222;
-			padding: 0;
-			margin: 0;
-			border: 2rpx solid #979797;
-		}
+  .add {
+    width: 338rpx;
+    background-color: #f83224;
+    border-radius: 40rpx;
+    height: 80rpx;
+    font-size: 32rpx;
+    color: #fff;
+    padding: 0;
+    margin: 0;
+  }
 
-		.add {
-			width: 338rpx;
-			background-color: #f83224;
-			border-radius: 40rpx;
-			height: 80rpx;
-			font-size: 32rpx;
-			color: #fff;
-			padding: 0;
-			margin: 0;
-
-		}
-
-		.add-international {
-			width: 702rpx;
-			background-color: #f83224;
-			border-radius: 40rpx;
-			height: 80rpx;
-			font-size: 32rpx;
-			color: #fff;
-			margin: 0 auto;
-		}
-	}
-</style>
+  .add-international {
+    width: 702rpx;
+    background-color: #f83224;
+    border-radius: 40rpx;
+    height: 80rpx;
+    font-size: 32rpx;
+    color: #fff;
+    margin: 0 auto;
+  }
+}
+</style>

pageC/addressManagement/component/address.vue

@@ -1,108 +1,134 @@
 <template>
-	<view class="item-list">
-		<view class="item-top">
-			<view class="name">
-				{{itemInfo.name}}
-			</view>
-			<text class="phone">
-				{{itemInfo.phone}}
-			</text>
-		</view>
-		<view class="item-content">
-			{{itemInfo.address}}
-		</view>
-		<view class="item-bottom">
-			<view class="item-left" @click="$emit('setDefault',itemInfo)">
-				<image v-if="!itemInfo.isDefault" src="../../../static/mine/327.png" class="address-icon" mode=""></image> 
-				<image v-else src="../../../static/mine/330.png" class="address-icon" mode=""></image>
-				<text >{{i18n.initial}}</text>
-			</view>
-			<view class="item-right">
-				<view class="item-left" style="margin-right: 24rpx;">
-					<image src="../../../static/mine/328 .png" class="address-icon" mode=""></image>
-					<text>{{i18n.edit}}</text>
-				</view>
-				<view class="item-left" @click="$emit('deleteAddress',itemInfo)">
-					<image src="../../../static/mine/329.png" class="address-icon" mode=""></image>
-					<text>{{i18n.delete}}</text>
-				</view>
-			</view>
-		</view>
-	</view>
+  <view class="item-list">
+    <view class="item-top">
+      <view class="name">
+        {{ itemInfo.name }}
+      </view>
+      <text class="phone">
+        {{ itemInfo.mobile }}
+      </text>
+    </view>
+    <view class="item-content">
+      {{
+        itemInfo.province_name +
+        itemInfo.city_name +
+        itemInfo.area_name +
+        itemInfo.address
+      }}
+    </view>
+    <view class="item-bottom">
+      <view class="item-left" @click="$emit('setDefault', itemInfo)">
+        <image
+          v-if="!itemInfo.is_default"
+          src="../../../static/mine/327.png"
+          class="address-icon"
+          mode=""
+        ></image>
+        <image
+          v-else
+          src="../../../static/mine/330.png"
+          class="address-icon"
+          mode=""
+        ></image>
+        <text>{{ i18n.initial }}</text>
+      </view>
+      <view class="item-right">
+        <view
+          class="item-left"
+          style="margin-right: 24rpx"
+          @click="$emit('toDetail', itemInfo.id)"
+        >
+          <image
+            src="../../../static/mine/328 .png"
+            class="address-icon"
+            mode=""
+          ></image>
+          <text>{{ i18n.edit }}</text>
+        </view>
+        <view class="item-left" @click="$emit('deleteAddress', itemInfo)">
+          <image
+            src="../../../static/mine/329.png"
+            class="address-icon"
+            mode=""
+          ></image>
+          <text>{{ i18n.delete }}</text>
+        </view>
+      </view>
+    </view>
+  </view>
 </template>
 
 <script>
-	export default{
-		data(){
-			return{}
-		},
-		props:{
-			itemInfo:{
-				type:Object,
-				default:{}
-			}
-		},
-		computed:{
-			i18n(){
-				return this.$t("index")
-			}
-		},
-		methods:{
-			
-		}
-	}
+export default {
+  name: "address",
+  data() {
+    return {};
+  },
+  props: {
+    itemInfo: {
+      type: Object,
+      default: {},
+    },
+  },
+  computed: {
+    i18n() {
+      return this.$t("index");
+    },
+  },
+  methods: {},
+};
 </script>
 
 <style scoped lang="scss">
-	.item-list{
-		background-color: #fff;
-		border-radius: 16rpx;
-		padding: 28rpx 20rpx 0;
-		margin-bottom: 20rpx;
-		.item-top{
-			display: flex;
-			.name{
-				margin-right: 16rpx;
-				font-size: 30rpx;
-				color: #222;
-				font-weight: 600;
-			}
-			.phone{
-				opacity: 0.8;
-				font-size: 26rpx;
-				color: #222;
-				line-height: 50rpx;
-			}
-		}
-		.item-content{
-			margin-top: 16rpx;
-			font-size: 24rpx;
-			color: #222;
-			opacity: .7;
-		}
-		.item-bottom{
-			display: flex;
-			justify-content: space-between;
-			align-items: center;
-			height: 82rpx;
-			border-top: 2rpx solid rgba(151, 151, 151, 0.2);
-			.item-right{
-				display: flex;
-				align-items: center;
-			}
-			.item-left{
-				font-size: 24rpx;
-				color: #222;
-				opacity: .7;
-				display: flex;
-				align-items: center;
-			}
-		}
-		.address-icon{
-			width: 26rpx;
-			height: 26rpx;
-			margin-right: 10rpx;
-		}
-	}
-	
-</style>
+.item-list {
+  background-color: #fff;
+  border-radius: 16rpx;
+  padding: 28rpx 20rpx 0;
+  margin-bottom: 20rpx;
+  .item-top {
+    display: flex;
+    .name {
+      margin-right: 16rpx;
+      font-size: 30rpx;
+      color: #222;
+      font-weight: 600;
+    }
+    .phone {
+      opacity: 0.8;
+      font-size: 26rpx;
+      color: #222;
+      line-height: 50rpx;
+    }
+  }
+  .item-content {
+    margin-top: 16rpx;
+    font-size: 24rpx;
+    color: #222;
+    opacity: 0.7;
+    margin-bottom: 10rpx;
+  }
+  .item-bottom {
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    height: 82rpx;
+    border-top: 2rpx solid rgba(151, 151, 151, 0.2);
+    .item-right {
+      display: flex;
+      align-items: center;
+    }
+    .item-left {
+      font-size: 24rpx;
+      color: #222;
+      opacity: 0.7;
+      display: flex;
+      align-items: center;
+    }
+  }
+  .address-icon {
+    width: 26rpx;
+    height: 26rpx;
+    margin-right: 10rpx;
+  }
+}
+</style>

pageC/internationalAddress/internationalAddress.vue

@@ -1,199 +1,395 @@
 <template>
-	<view class="page">
-		<view class="content">
-			<view class="title">
-				<text class="title-left">{{ i18n.contacts }}</text>
-			</view>
-			<!-- 注意，如果需要兼容微信小程序，最好通过setRules方法设置rules规则 -->
-			<u--form labelPosition="left" :model="model1" ref="uForm">
-				<u-form-item labelWidth="150rpx" @click="showDialog = true" :label="i18n.country" borderBottom
-					ref="item1">
-
-					<u--input v-model="model1.userInfo.sex" disabled disabledColor="#ffffff"
-						:placeholder="i18n.selection" border="none"></u--input>
-					<u-icon slot="right" name="arrow-right"></u-icon>
-				</u-form-item>
-				<u-form-item labelWidth="150rpx" :label="i18n.name" borderBottom ref="item1">
-					<u--input v-model="model1.userInfo.name" :placeholder="i18n.goods" border="none"></u--input>
-				</u-form-item>
-
-				<u-form-item labelWidth="150rpx" :label="i18n.phone" borderBottom ref="item1">
-					<u--input v-model="model1.userInfo.name" :placeholder="i18n.pleasePhoneNumber"
-						border="none"></u--input>
-				</u-form-item>
-				<u-form-item labelWidth="150rpx" :label="i18n.postalCode" borderBottom ref="item1">
-					<u--input v-model="model1.userInfo.name" :placeholder="i18n.PleacePostalCode"
-						border="none"></u--input>
-				</u-form-item>
-				<u-form-item labelWidth="150rpx" :label="i18n.city" borderBottom @click="show = true" ref="item1">
-					<u--input v-model="model1.userInfo.sex" disabled disabledColor="#ffffff"
-						:placeholder="i18n.township" border="none"></u--input>
-					<u-icon slot="right" name="arrow-right"></u-icon>
-				</u-form-item>
-
-				<u-form-item labelWidth="150rpx" :label="i18n.detailed" borderBottom ref="item1">
-					<u--input v-model="model1.userInfo.name" :placeholder="i18n.sect" border="none"></u--input>
-				</u-form-item>
-
-				<u-form-item labelWidth="150rpx" :label="i18n.companyName" borderBottom ref="item1">
-					<u--input v-model="model1.userInfo.name" :placeholder="i18n.company" border="none"></u--input>
-				</u-form-item>
-				<u-form-item labelWidth="150rpx" :label="i18n.email" borderBottom ref="item1">
-					<u--input v-model="model1.userInfo.name" :placeholder="i18n.pleaseEmail" border="none"></u--input>
-				</u-form-item>
-				<view style="display: flex;justify-content: space-between;align-items: center;">
-					<view class="item-left">
-						<image src="../../static/mine/330.png" class="address-icon" mode=""></image>
-						<text>{{ i18n.addressBook }}</text>
-					</view>
-					<text style="font-size: 24rpx; color: #333;">{{i18n.empty}}</text>
-				</view>
-			</u--form>
-
-		</view>
-		<SelectCity :show="show" @close="close" />
-		<view class="footer">
-			<button class="save">{{i18n.preserve}}</button>
-		</view>
-
-		<u-picker :show="showDialog" :columns="columns" ></u-picker>
-	</view>
+  <view class="page">
+    <view class="content">
+      <view class="title">
+        <text class="title-left">{{ i18n.contacts }}</text>
+      </view>
+      <!-- 注意，如果需要兼容微信小程序，最好通过setRules方法设置rules规则 -->
+      <u--form labelPosition="left" :model="model1" ref="uForm">
+        <u-form-item
+          labelWidth="150rpx"
+          @click="showDialog = true"
+          :label="i18n.country"
+          borderBottom
+          ref="item1"
+        >
+          <u--input
+            v-model="model1.userInfo.country"
+            disabled
+            disabledColor="#ffffff"
+            :placeholder="i18n.selection"
+            border="none"
+          ></u--input>
+          <u-icon slot="right" name="arrow-right"></u-icon>
+        </u-form-item>
+        <u-form-item
+          labelWidth="150rpx"
+          :label="i18n.name"
+          borderBottom
+          ref="item1"
+        >
+          <u--input
+            v-model="model1.userInfo.name"
+            :placeholder="i18n.goods"
+            border="none"
+          ></u--input>
+        </u-form-item>
+
+        <u-form-item
+          labelWidth="150rpx"
+          :label="i18n.phone"
+          borderBottom
+          ref="item1"
+        >
+          <u--input
+            v-model="model1.userInfo.phone"
+            :placeholder="i18n.pleasePhoneNumber"
+            border="none"
+          ></u--input>
+        </u-form-item>
+        <u-form-item
+          labelWidth="150rpx"
+          :label="i18n.postalCode"
+          borderBottom
+          ref="item1"
+        >
+          <u--input
+            v-model="model1.userInfo.zip_code"
+            :placeholder="i18n.PleacePostalCode"
+            border="none"
+          ></u--input>
+        </u-form-item>
+        <u-form-item
+          labelWidth="150rpx"
+          :label="i18n.city"
+          borderBottom
+          @click="openCity"
+          ref="item1"
+        >
+          <u--input
+            v-model="model1.userInfo.city"
+            disabled
+            disabledColor="#ffffff"
+            :placeholder="i18n.township"
+            border="none"
+          ></u--input>
+          <u-icon slot="right" name="arrow-right"></u-icon>
+        </u-form-item>
+
+        <u-form-item
+          labelWidth="150rpx"
+          :label="i18n.detailed"
+          borderBottom
+          ref="item1"
+        >
+          <u--input
+            v-model="model1.userInfo.detailed"
+            :placeholder="i18n.sect"
+            border="none"
+          ></u--input>
+        </u-form-item>
+
+        <u-form-item
+          labelWidth="150rpx"
+          :label="i18n.companyName"
+          borderBottom
+          ref="item1"
+        >
+          <u--input
+            v-model="model1.userInfo.companyName"
+            :placeholder="i18n.company"
+            border="none"
+          ></u--input>
+        </u-form-item>
+        <u-form-item
+          labelWidth="150rpx"
+          :label="i18n.email"
+          borderBottom
+          ref="item1"
+        >
+          <u--input
+            v-model="model1.userInfo.email"
+            :placeholder="i18n.pleaseEmail"
+            border="none"
+          ></u--input>
+        </u-form-item>
+        <view
+          style="
+            display: flex;
+            justify-content: space-between;
+            align-items: center;
+          "
+        >
+          <view class="item-left">
+            <image
+              src="../../static/mine/330.png"
+              class="address-icon"
+              mode=""
+            ></image>
+            <text>{{ i18n.addressBook }}</text>
+          </view>
+          <text style="font-size: 24rpx; color: #333">{{ i18n.empty }}</text>
+        </view>
+      </u--form>
+    </view>
+    <!-- <SelectCity :show="show" @close="close" :countryId="country.id" /> -->
+    <view class="footer">
+      <button class="save" @click="submit">{{ i18n.preserve }}</button>
+    </view>
+
+    <u-picker
+      :show="show"
+      :columns="cityList"
+      keyName="name"
+      @confirm="countrycConfirm"
+      @cancel="show = false"
+      :closeOnClickOverlay="true"
+      @close="close"
+    ></u-picker>
+    <u-picker
+      :show="showDialog"
+      :columns="columns"
+      keyName="name"
+      @cancel="showDialog = false"
+      :closeOnClickOverlay="true"
+      @confirm="confirm"
+      @close="close"
+    ></u-picker>
+  </view>
 </template>
 
 <script>
-	import SelectCity from '../addEditAddress/component/selectCity.vue';
-	export default {
-		components: {
-			SelectCity
-		},
-		computed: {
-			i18n() {
-				return this.$t('index')
-			}
-		},
-		data() {
-			return {
-				show: false,
-				showDialog: false,
-				model1: {
-					userInfo: {
-						name: '',
-						sex: '',
-					},
-				},
-				rules: {
-					'userInfo.name': {
-						type: 'string',
-						required: true,
-						message: '请填写姓名',
-						trigger: ['blur', 'change']
-					},
-					'userInfo.sex': {
-						type: 'string',
-						max: 1,
-						required: true,
-						message: '请选择男或女',
-						trigger: ['blur', 'change']
-					},
-				},
-			};
-		},
-		methods: {
-			sexSelect(e) {
-				this.model1.userInfo.sex = e.name
-				this.$refs.uForm.validateField('userInfo.sex')
-			},
-			close() {
-				this.show = false
-				this.showDialog = false
-			}
-		},
-		mounted() {
-			uni.setNavigationBarTitle({
-				title: this.i18n.newAddress
-			})
-		},
-		onReady() {
-			//如果需要兼容微信小程序，并且校验规则中含有方法等，只能通过setRules方法设置规则。
-			this.$refs.uForm.setRules(this.rules)
-		},
-	};
+import SelectCity from "../addEditAddress/component/selectCity.vue";
+export default {
+  components: {
+    SelectCity,
+  },
+  computed: {
+    i18n() {
+      return this.$t("index");
+    },
+  },
+  data() {
+    return {
+      show: false, //城市弹窗
+      showDialog: false, //国家弹窗
+      //表单数据
+      model1: {
+        userInfo: {
+          name: "",
+          phone: "",
+          country: "",
+          postalCode: "",
+          city: "",
+          detailed: "",
+          email: "",
+          companyName: "",
+          zip_code: "",
+        },
+      },
+      selectedCity: {}, //选中的城市
+      columns: [], //获取到的国家数据
+      country: {}, //选中的国家数据
+      cityList: [[]], //选中国家之后的城市数据
+      addressId: "", //编辑的地址id
+      rules: {
+        "userInfo.name": {
+          type: "string",
+          required: true,
+          message: "请填写姓名",
+          trigger: ["blur", "change"],
+        },
+        "userInfo.sex": {
+          type: "string",
+          max: 1,
+          required: true,
+          message: "请选择男或女",
+          trigger: ["blur", "change"],
+        },
+      },
+    };
+  },
+  onLoad(options) {
+    if (options.id) {
+      this.addressId = options.id;
+      this.getAddressDetail(options.id);
+    } else {
+      uni.setNavigationBarTitle({
+        title: this.i18n.newAddress,
+      });
+    }
+  },
+  methods: {
+    //回显数据
+    getAddressDetail(id) {
+      uni.setNavigationBarTitle({
+        title: "编辑地址",
+      });
+      uni.$u.http.get(`/api/address/${id}`).then((res) => {
+        this.model1.userInfo.city = res.province_name;
+        this.model1.userInfo.name = res.name;
+        this.model1.userInfo.phone = res.mobile;
+        this.model1.userInfo.detailed = res.address;
+        this.model1.userInfo.companyName = res.company_name;
+        this.model1.userInfo.is_default = res.is_default;
+        this.model1.userInfo.country = res.country_name;
+        this.model1.userInfo.email = res.email;
+        this.country.id = res.country_id;
+        this.selectedCity.id = res.province_id;
+        this.model1.userInfo.zip_code = res.zip_code;
+      });
+    },
+
+    //选择国家
+    confirm(e) {
+      this.country = e.value[0];
+      this.model1.userInfo.country = this.country.name;
+      this.getCityList(this.country.id);
+      this.showDialog = false;
+    },
+    //打开选择城市的弹窗
+    openCity() {
+      //判断是否选择国家
+      if (JSON.stringify(this.country) != "{}") {
+        //判断选中的国家有没有城市数据
+        if (this.cityList[0].length > 0) {
+          this.show = true;
+        } else {
+          uni.$u.toast("该国家没有城市数据，请直接填写详细地址");
+        }
+      } else {
+        uni.$u.toast("请先选择国家");
+      }
+    },
+    //选择国家
+    countrycConfirm(e) {
+      this.selectedCity = e.value[0];
+      this.model1.userInfo.city = this.selectedCity.name;
+      this.show = false;
+    },
+    submit() {
+      const obj = {
+        mobile: this.model1.userInfo.phone,
+        name: this.model1.userInfo.name,
+        country_id: this.country.id,
+        province_id: this.selectedCity.id,
+        address: this.model1.userInfo.detailed,
+        company_name: this.model1.userInfo.companyName,
+        email: this.model1.userInfo.email,
+        zip_code: this.model1.userInfo.zip_code,
+      };
+      if (this.addressId) {
+        uni.$u.http.put(`/api/address/${this.addressId}`, obj).then((res) => {
+          this.$router.back();
+        });
+      } else {
+        uni.$u.http.post(`/api/address`, obj).then((res) => {
+          this.$router.back();
+        });
+      }
+    },
+    //关闭弹窗
+    close() {
+      this.show = false;
+      this.showDialog = false;
+    },
+    //获取所有国家
+    getCountryList() {
+      uni.$u.http.get(`/api/area?is_domestic=0&pid=`).then((res) => {
+        this.columns = [res];
+      });
+    },
+    //根据国家获取城市
+    getCityList(num) {
+      uni.$u.http.get(`/api/area/tree?pid=${num}`).then((res) => {
+        this.cityList = [res];
+      });
+    },
+  },
+  mounted() {
+    this.getCountryList();
+  },
+  onReady() {
+    //如果需要兼容微信小程序，并且校验规则中含有方法等，只能通过setRules方法设置规则。
+    this.$refs.uForm.setRules(this.rules);
+  },
+};
 </script>
 
 <style lang="scss" scoped>
-	.page {
-		padding: 20rpx 24rpx;
-
-		.content {
-			background-color: #fff;
-			border-radius: 16rpx;
-			padding: 0 24rpx;
-
-			.title {
-				display: flex;
-				justify-content: space-between;
-				align-items: center;
-				height: 100rpx;
-				border-bottom: 2rpx solid rgba(151, 151, 151, .1);
-
-				.title-left {
-					font-size: 32rpx;
-					color: #333;
-					font-weight: 600;
-				}
-
-				.title-icon {
-					width: 26rpx;
-					height: 26rpx;
-					margin-right: 10rpx;
-				}
-
-				.title-right {
-					display: flex;
-					align-items: center;
-					font-size: 24rpx;
-					color: rgba(51, 51, 51, .6);
-				}
-			}
-
-			.company {
-				height: 102rpx;
-				display: flex;
-				align-items: center;
-				border-bottom: 2rpx solid rgba(151, 151, 151, .1);
-			}
-		}
-
-		.item-left {
-			font-size: 24rpx;
-			color: #333;
-			display: flex;
-			align-items: center;
-			height: 86rpx;
-
-			.address-icon {
-				width: 26rpx;
-				height: 26rpx;
-				margin-right: 10rpx;
-			}
-		}
-
-		.footer {
-			background-color: #fff;
-			position: fixed;
-			bottom: 0;
-			height: 146rpx;
-			width: 750rpx;
-			left: 0;
-			padding-top: 20rpx;
-
-			.save {
-				width: 702rpx;
-				margin: 0 auto;
-				background-color: #f83224;
-				color: #fff;
-				border-radius: 40rpx;
-			}
-		}
-	}
-</style>
+.page {
+  padding: 20rpx 24rpx;
+
+  .content {
+    background-color: #fff;
+    border-radius: 16rpx;
+    padding: 0 24rpx;
+
+    .title {
+      display: flex;
+      justify-content: space-between;
+      align-items: center;
+      height: 100rpx;
+      border-bottom: 2rpx solid rgba(151, 151, 151, 0.1);
+
+      .title-left {
+        font-size: 32rpx;
+        color: #333;
+        font-weight: 600;
+      }
+
+      .title-icon {
+        width: 26rpx;
+        height: 26rpx;
+        margin-right: 10rpx;
+      }
+
+      .title-right {
+        display: flex;
+        align-items: center;
+        font-size: 24rpx;
+        color: rgba(51, 51, 51, 0.6);
+      }
+    }
+
+    .company {
+      height: 102rpx;
+      display: flex;
+      align-items: center;
+      border-bottom: 2rpx solid rgba(151, 151, 151, 0.1);
+    }
+  }
+
+  .item-left {
+    font-size: 24rpx;
+    color: #333;
+    display: flex;
+    align-items: center;
+    height: 86rpx;
+
+    .address-icon {
+      width: 26rpx;
+      height: 26rpx;
+      margin-right: 10rpx;
+    }
+  }
+
+  .footer {
+    background-color: #fff;
+    position: fixed;
+    bottom: 0;
+    height: 146rpx;
+    width: 750rpx;
+    left: 0;
+    padding-top: 20rpx;
+
+    .save {
+      width: 702rpx;
+      margin: 0 auto;
+      background-color: #f83224;
+      color: #fff;
+      border-radius: 40rpx;
+    }
+  }
+}
+</style>

pageC/mineFollow/mineFollow.vue

@@ -4,37 +4,48 @@
       <view class="tab" slot="center">
         <view
           class=""
-          :class="{ commodity: follow == 1 }"
-          @click="tabSwitch(1)"
+          :class="{ commodity: follow == 0 }"
+          @click="tabSwitch(0)"
         >
           {{ i18n.mineCommodity }}
         </view>
-        <view :class="{ commodity: follow == 2 }" @click="tabSwitch(2)">
+        <view :class="{ commodity: follow == 1 }" @click="tabSwitch(1)">
           {{ i18n.team }}
         </view>
       </view>
     </u-navbar>
     <!-- 关注商品列表 -->
-    <view class="content" v-if="follow == 1">
+    <view class="content" v-if="follow == 0">
       <view
         class="commodity-detail"
         v-for="item in commodityList"
         @click="toDetail(item)"
       >
-        <image :src="item.img" class="commodity-img" mode=""></image>
+        <image
+          :src="item.merchant_goods.goods.image"
+          class="commodity-img"
+          mode=""
+        ></image>
         <view class="commodity-right">
           <view class="commodity-title">
-            {{ item.title }}
+            {{ item.merchant_goods.goods.name_cn }}
           </view>
           <view class="commodity-follow">
-            <text v-show="item.followNum <= 1000">{{ item.followNum }} </text>
-            <text v-show="item.followNum > 1000">1000+</text>{{ i18n.people }}
+            <text v-show="item.interest_num <= 1000"
+              >{{ item.interest_num }}
+            </text>
+            <text v-show="item.interest_num > 1000">1000+</text
+            >{{ i18n.people }}
           </view>
           <view class="commodity-price">
             <text class="symbol">￥</text>
-            <text class="integer">{{ item.price[0] }}</text
+            <text class="integer">{{
+              item.merchant_goods.goods.price.split(".")[0]
+            }}</text
             >.
-            <text class="decimal">{{ item.price[1] }}</text>
+            <text class="decimal">{{
+              item.merchant_goods.goods.price.split(".")[1]
+            }}</text>
           </view>
         </view>
       </view>
@@ -42,25 +53,26 @@
     <!-- 关注商品列表 -->
 
     <!-- 关注团长列表 -->
-    <view class="content" v-if="follow == 2">
+    <view class="content" v-if="follow == 1">
       <view class="team-content" v-for="item in teamList">
-        <image :src="item.img" class="header-img" mode=""></image>
+        <image :src="item.merchant.image" class="header-img" mode=""></image>
         <view class="team-right">
           <view class="">
             <view class="name">
-              {{ item.name }}
+              {{ item.merchant.merchant_name }}
             </view>
             <view class="score">
               <u-rate
                 count="5"
+                disabled
                 :allowHalf="true"
                 :gutter="1"
                 inactiveColor="#ffacab"
                 activeColor="#FF1515"
-                v-model="item.score"
+                v-model="item.merchant.score"
                 :size="14"
               ></u-rate>
-              <text class="num">{{ item.score }}</text>
+              <text class="num">{{ item.merchant.score }}</text>
             </view>
           </view>
           <button class="check" @click="toHomepage">{{ i18n.see }}</button>
@@ -72,20 +84,11 @@
 </template>
 
 <script>
-import { getFollowList } from "../../network/api/follow";
 export default {
   data() {
     return {
-      follow: 1,
-      commodityList: [
-        {
-          title:
-            "OATLY 噢麦力 咖啡大师醇香燕麦奶早餐奶便携装植物蛋白饮料奶早餐奶便携装植物蛋奶早餐奶便携装植物蛋",
-          followNum: 1001,
-          price: ["100", "1"],
-          img: "https://img.shetu66.com/2023/04/26/1682496554628042.png",
-        },
-      ],
+      follow: 0,
+      commodityList: [],
       teamList: [
         {
           img: "http://pic.imeitou.com/uploads/allimg/240522/10-2405221F140.jpg",
@@ -108,6 +111,7 @@ export default {
   methods: {
     tabSwitch(num) {
       this.follow = num;
+      this.getInfoList(num);
     },
     rightClick() {
       console.log(111);
@@ -122,14 +126,18 @@ export default {
         url: "/pageA/productdetails",
       });
     },
-    getInfoList() {
-      getFollowList({ interest_type: 0 }).then((res) => {
-        console.log(res);
+    getInfoList(num) {
+      uni.$u.http.get(`api/interest/list?interest_type=${num}`).then((res) => {
+        if (num) {
+          this.teamList = res.data;
+        } else {
+          this.commodityList = res.data;
+        }
       });
     },
   },
   mounted() {
-    this.getInfoList();
+    this.getInfoList(0);
   },
 };
 </script>
@@ -202,6 +210,10 @@ export default {
             color: #ff1515;
             font-weight: 600;
           }
+
+          ::v-deep .u-icon__icon {
+            color: #f83224 !important;
+          }
         }
 
         .check {

pageC/recharge/recharge.vue

@@ -1,191 +1,227 @@
 <template>
-	<view class="recharge">
-		<view class="mine">
-			我的余额（元）
-		</view>
-		<view class="money">
-			500.00
-		</view>
-		<view class="to-withdrawal">
-			<AllRight name='去提现' :withdrawal="true" @toDetail="toWithdrawal" />
-		</view>
-		<view class="select-money">
-			<view class="title">
-				余额账户充值
-			</view>
-			<!-- 选择充值金额 -->
-			<view class="select-recharge">
-				<view class="recharge-money" :class="{'back-red':backgroundRed==1}" @click="selectMoney(1)">
-					<text>￥</text>100
-				</view>
-				<view class="recharge-money" :class="{'back-red':backgroundRed==2}" @click="selectMoney(2)">
-					<text>￥</text>200
-				</view>
-				<view class="recharge-money" :class="{'back-red':backgroundRed==3}" @click="selectMoney(3)">
-					<text>￥</text>300
-				</view>
-				<view class="recharge-money" :class="{'back-red':backgroundRed==4}" @click="selectMoney(4)">
-					<text>￥</text>600
-				</view>
-				<view class="recharge-money" :class="{'back-red':backgroundRed==5}" @click="selectMoney(5)">
-					<text>￥</text>800
-				</view>
-				<view class="recharge-money" :class="{'back-red':backgroundRed==6}" @click="selectMoney(6)">
-					<text>￥</text>1000
-				</view>
-			</view>
-			<!-- 选择充值金额 -->
-			<u--input placeholder="输入自定义金额" prefixIcon="rmb"
-				prefixIconStyle="font-size: 36rpx;color: #000;font-weight:600"></u--input>
-
-			<view class="payment">
-				<view class="title">
-					支付方式
-				</view>
-				<view class="wx-pay">
-					<view class="logo">
-						<image src="../../static/mine/323.png" class="wx-logo" mode=""></image>
-						微信支付
-					</view>
-
-				</view>
-			</view>
-			<button class="recharge-btn">充值</button>
-		</view>
-
-	</view>
+  <view class="recharge">
+    <view class="mine"> 我的余额（元） </view>
+    <view class="money"> 500.00 </view>
+    <view class="to-withdrawal">
+      <AllRight name="去提现" :withdrawal="true" @toDetail="toWithdrawal" />
+    </view>
+    <view class="select-money">
+      <view class="title"> 余额账户充值 </view>
+      <!-- 选择充值金额 -->
+      <view class="select-recharge">
+        <view
+          class="recharge-money"
+          :class="{ 'back-red': backgroundRed == 100 }"
+          @click="selectMoney(100)"
+        >
+          <text>￥</text>100
+        </view>
+        <view
+          class="recharge-money"
+          :class="{ 'back-red': backgroundRed == 200 }"
+          @click="selectMoney(200)"
+        >
+          <text>￥</text>200
+        </view>
+        <view
+          class="recharge-money"
+          :class="{ 'back-red': backgroundRed == 300 }"
+          @click="selectMoney(300)"
+        >
+          <text>￥</text>300
+        </view>
+        <view
+          class="recharge-money"
+          :class="{ 'back-red': backgroundRed == 600 }"
+          @click="selectMoney(600)"
+        >
+          <text>￥</text>600
+        </view>
+        <view
+          class="recharge-money"
+          :class="{ 'back-red': backgroundRed == 800 }"
+          @click="selectMoney(800)"
+        >
+          <text>￥</text>800
+        </view>
+        <view
+          class="recharge-money"
+          :class="{ 'back-red': backgroundRed == 1000 }"
+          @click="selectMoney(1000)"
+        >
+          <text>￥</text>1000
+        </view>
+      </view>
+      <!-- 选择充值金额 -->
+      <u--input
+        placeholder="输入自定义金额"
+        prefixIcon="rmb"
+        v-model="rmb"
+        prefixIconStyle="font-size: 36rpx;color: #000;font-weight:600"
+      ></u--input>
+
+      <view class="payment">
+        <view class="title"> 支付方式 </view>
+        <view class="wx-pay">
+          <view class="logo">
+            <image
+              src="../../static/mine/323.png"
+              class="wx-logo"
+              mode=""
+            ></image>
+            微信支付
+          </view>
+        </view>
+      </view>
+      <button class="recharge-btn" @click="recharge">充值</button>
+    </view>
+  </view>
 </template>
 
 <script>
-	import AllRight from '../mineComponent/allRight/allRight.vue'
-
-	export default {
-		components: {
-			AllRight
-		},
-		data() {
-			return {
-				backgroundRed: 1
-			}
-		},
-		methods: {
-			selectMoney(num) {
-				this.backgroundRed = num
-			},
-			toWithdrawal() {
-				uni.navigateTo({
-					url: '/pageC/withdrawal/withdrawal'
-				})
-			}
-		}
-	}
+import AllRight from "../mineComponent/allRight/allRight.vue";
+
+export default {
+  components: {
+    AllRight,
+  },
+  data() {
+    return {
+      backgroundRed: 0,
+      rmb: "",
+    };
+  },
+  methods: {
+    selectMoney(num) {
+      this.backgroundRed = num;
+    },
+    toWithdrawal() {
+      uni.navigateTo({
+        url: "/pageC/withdrawal/withdrawal",
+      });
+    },
+    //充值
+    recharge() {
+      let num = this.rmb == "" ? this.backgroundRed : this.rmb;
+
+      uni.$u.http
+        .post(`/api/recharge`, {
+          account_type: "balance",
+          amount: num,
+        })
+        .then((res) => {
+          console.log(res);
+        });
+    },
+  },
+};
 </script>
 
 <style lang="scss" scoped>
-	.recharge {
-		height: 100vh;
-		background-color: #fff;
-
-		.mine {
-			padding-top: 63rpx;
-			text-align: center;
-			color: #222;
-			font-size: 28rpx;
-			border-top: 1px solid #ccc;
-		}
-
-		.money {
-			font-size: 84rpx;
-			text-align: center;
-			color: #222;
-			font-weight: 600;
-			margin-top: 28rpx;
-			margin-bottom: 20rpx;
-		}
-
-		.to-withdrawal {
-			display: flex;
-			justify-content: center;
-		}
-
-		.select-money {
-			padding-top: 42rpx;
-			border-top: 1px solid #ccc;
-			margin: 0 auto;
-			margin-top: 64rpx;
-			width: 94%;
-
-			.title {
-				font-size: 32rpx;
-				color: #222;
-				font-weight: 500;
-				margin-bottom: 36rpx;
-			}
-
-			.payment {
-				margin-top: 46rpx;
-
-				.wx-pay {
-					height: 100rpx;
-					background-color: #f4f4f4;
-					width: 94%;
-					display: flex;
-					justify-content: space-between;
-					align-items: center;
-					padding: 0 20rpx;
-					font-size: 32rpx;
-
-					.logo {
-						display: flex;
-						align-items: center;
-					}
-
-					.wx-logo {
-						width: 39rpx;
-						height: 34rpx;
-						margin-right: 18rpx;
-					}
-				}
-			}
-
-			.recharge-btn {
-				background-color: #f83224;
-				border-radius: 44rpx;
-				color: #fff;
-				margin-top: 150rpx;
-			}
-
-			.select-recharge {
-				display: flex;
-				justify-content: space-between;
-				flex-wrap: wrap;
-
-				.recharge-money {
-					width: 210rpx;
-					height: 120rpx;
-					border: 1px solid #f83224;
-					border-radius: 16rpx;
-					text-align: center;
-					line-height: 120rpx;
-					font-size: 40rpx;
-					font-weight: 600;
-					margin-bottom: 26rpx;
-
-					text {
-						font-size: 24rpx;
-					}
-				}
-
-				.back-red {
-					background-color: #f83224;
-					color: #fff;
-				}
-			}
-		}
-	}
-
-	/deep/.u-input {
-		background-color: #f4f4f4;
-		height: 80rpx;
-	}
-</style>
+.recharge {
+  height: 100vh;
+  background-color: #fff;
+
+  .mine {
+    padding-top: 63rpx;
+    text-align: center;
+    color: #222;
+    font-size: 28rpx;
+    border-top: 1px solid #ccc;
+  }
+
+  .money {
+    font-size: 84rpx;
+    text-align: center;
+    color: #222;
+    font-weight: 600;
+    margin-top: 28rpx;
+    margin-bottom: 20rpx;
+  }
+
+  .to-withdrawal {
+    display: flex;
+    justify-content: center;
+  }
+
+  .select-money {
+    padding-top: 42rpx;
+    border-top: 1px solid #ccc;
+    margin: 0 auto;
+    margin-top: 64rpx;
+    width: 94%;
+
+    .title {
+      font-size: 32rpx;
+      color: #222;
+      font-weight: 500;
+      margin-bottom: 36rpx;
+    }
+
+    .payment {
+      margin-top: 46rpx;
+
+      .wx-pay {
+        height: 100rpx;
+        background-color: #f4f4f4;
+        width: 94%;
+        display: flex;
+        justify-content: space-between;
+        align-items: center;
+        padding: 0 20rpx;
+        font-size: 32rpx;
+
+        .logo {
+          display: flex;
+          align-items: center;
+        }
+
+        .wx-logo {
+          width: 39rpx;
+          height: 34rpx;
+          margin-right: 18rpx;
+        }
+      }
+    }
+
+    .recharge-btn {
+      background-color: #f83224;
+      border-radius: 44rpx;
+      color: #fff;
+      margin-top: 150rpx;
+    }
+
+    .select-recharge {
+      display: flex;
+      justify-content: space-between;
+      flex-wrap: wrap;
+
+      .recharge-money {
+        width: 210rpx;
+        height: 120rpx;
+        border: 1px solid #f83224;
+        border-radius: 16rpx;
+        text-align: center;
+        line-height: 120rpx;
+        font-size: 40rpx;
+        font-weight: 600;
+        margin-bottom: 26rpx;
+
+        text {
+          font-size: 24rpx;
+        }
+      }
+
+      .back-red {
+        background-color: #f83224;
+        color: #fff;
+      }
+    }
+  }
+}
+
+/deep/.u-input {
+  background-color: #f4f4f4;
+  height: 80rpx;
+}
+</style>

pageD/ensureRecharge/ensureRecharge.vue

@@ -1,113 +1,105 @@
 <template>
-	<view class="withdrawal">
-		<!-- 头部 -->
-		<view class="withdrawal-top">
-			<view class="title">
-				支付方式
-			</view>
-			<view class="wx">
-				<image src="../../static/mine/323.png" class="wx-logo" mode=""></image>
-				<text>微信余额</text>
-			</view>
-		</view>
-			<!-- 充值头部 -->
-		<view class="content">
-			<view class="money">
-				充值金额
-			</view>
-			<view class="inp">
-				<text>￥</text>
-				<input type="text" />
-			</view>
-			<button class="immediately">立即充值</button>
-
-		</view>
-	</view>
+  <view class="withdrawal">
+    <!-- 头部 -->
+    <view class="withdrawal-top">
+      <view class="title"> 支付方式 </view>
+      <view class="wx">
+        <image src="../../static/mine/323.png" class="wx-logo" mode=""></image>
+        <text>微信余额</text>
+      </view>
+    </view>
+    <!-- 充值头部 -->
+    <view class="content">
+      <view class="money"> 充值金额 </view>
+      <view class="inp">
+        <text>￥</text>
+        <input type="text" />
+      </view>
+      <button class="immediately">立即充值</button>
+    </view>
+  </view>
 </template>
 
 <script>
-	export default {
-		data() {
-			return {
-
-			}
-		},
-		methods: {
-			toWithdrawalDetail(){
-				uni.navigateTo({
-					url:"/pageC/withdrawalDetail/withdrawalDetail"
-				})
-			}
-		},
-		mounted() {
-			uni.setNavigationBarTitle({
-				title:"保证金充值"
-			})
-		}
-	}
+export default {
+  data() {
+    return {};
+  },
+  methods: {
+    toWithdrawalDetail() {
+      uni.navigateTo({
+        url: "/pageC/withdrawalDetail/withdrawalDetail",
+      });
+    },
+  },
+  mounted() {
+    uni.setNavigationBarTitle({
+      title: "保证金充值",
+    });
+  },
+};
 </script>
 
 <style scoped lang="scss">
-	.withdrawal {
-		padding: 20rpx 24rpx 0;
-		
-		.withdrawal-top {
-			display: flex;
-			justify-content: space-between;
-			align-items: center;
-			height: 104rpx;
-			background-color: #fff;
-			border-radius: 16rpx;
-			padding: 0 24rpx;
-			.title {
-				font-size: 30rpx;
-			}
+.withdrawal {
+  padding: 20rpx 24rpx 0;
+
+  .withdrawal-top {
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    height: 104rpx;
+    background-color: #fff;
+    border-radius: 16rpx;
+    padding: 0 24rpx;
+    .title {
+      font-size: 30rpx;
+    }
 
-			.wx {
-				display: flex;
-				align-items: center;
-				height: 50rpx;
-				.wx-logo {
-					width: 40rpx;
-					height: 40rpx;
-					margin-right: 10rpx;
-				}
-			}
-		}
-		.content{
-			background-color: #fff;
-			border-radius: 16rpx;
-			margin-top: 16rpx;
-			padding: 32rpx 24rpx 46rpx;
-			.money{
-				font-size: 30rpx;
-			}
-			.inp{
-				display: flex;
-				height: 110rpx;
-				align-items: center;
-				border-bottom: 2rpx solid rgba(151, 151, 151, 0.3);
-				margin-bottom: 18rpx;
-			}
-			.all-money{
-				font-size: 24rpx;
-				color: #555;
-			}
-			.immediately{
-				box-shadow: 0rpx 12rpx 28rpx -12rpx #F83224;
-				border-radius: 44rpx;
-				background-color: #F83224;
-				color: #fff;
-				margin-top: 60rpx;
-				margin-bottom: 60rpx;
-				
-			}
-			.detail{
-				text-align: center;
-				font-size: 26rpx;
-				opacity: 0.6;
-				color: #131415;
-			}
-		}
-	}
-</style>
+    .wx {
+      display: flex;
+      align-items: center;
+      height: 50rpx;
+      .wx-logo {
+        width: 40rpx;
+        height: 40rpx;
+        margin-right: 10rpx;
+      }
+    }
+  }
+  .content {
+    background-color: #fff;
+    border-radius: 16rpx;
+    margin-top: 16rpx;
+    padding: 32rpx 24rpx 46rpx;
+    .money {
+      font-size: 30rpx;
+    }
+    .inp {
+      display: flex;
+      height: 110rpx;
+      align-items: center;
+      border-bottom: 2rpx solid rgba(151, 151, 151, 0.3);
+      margin-bottom: 18rpx;
+    }
+    .all-money {
+      font-size: 24rpx;
+      color: #555;
+    }
+    .immediately {
+      box-shadow: 0rpx 12rpx 28rpx -12rpx #f83224;
+      border-radius: 44rpx;
+      background-color: #f83224;
+      color: #fff;
+      margin-top: 60rpx;
+      margin-bottom: 60rpx;
+    }
+    .detail {
+      text-align: center;
+      font-size: 26rpx;
+      opacity: 0.6;
+      color: #131415;
+    }
+  }
+}
+</style>

pageD/platformProducts/platformProducts.vue

@@ -1,42 +1,50 @@
 <template>
-	<view class="page">
-		<u--input style="background: #f4f4f4;" placeholder="搜索商品名称" shape="circle" prefixIcon="search"
-			prefixIconStyle="font-size: 22px;color: #909399"></u--input>
-		<view class="content-list">
-			<GoodsInformation status="1"/>
-		</view>
-	</view>
+  <view class="page">
+    <u--input
+      style="background: #f4f4f4"
+      placeholder="搜索商品名称"
+      shape="circle"
+      prefixIcon="search"
+      prefixIconStyle="font-size: 22px;color: #909399"
+    ></u--input>
+    <view class="content-list">
+      <GoodsInformation status="1" />
+    </view>
+  </view>
 </template>
 
 <script>
-	import GoodsInformation from '../components/goodsInformation.vue'
-	export default {
-		components:{
-			GoodsInformation,
-		},
-		data() {
-			return {
-
-			}
-		},
-		methods: {
-
-		},
-		mounted() {
-			uni.setNavigationBarTitle({
-				title: "平台商品库"
-			});
-		}
-	}
+import GoodsInformation from "../components/goodsInformation.vue";
+export default {
+  components: {
+    GoodsInformation,
+  },
+  data() {
+    return {};
+  },
+  methods: {
+    getProductsList() {
+      uni.$u.http.post(`/api/goods/platform_goods`).then((res) => {
+        console.log(res);
+      });
+    },
+  },
+  mounted() {
+    this.getProductsList();
+    uni.setNavigationBarTitle({
+      title: "平台商品库",
+    });
+  },
+};
 </script>
 
 <style scoped lang="scss">
-	.page {
-		background-color: #fff;
-		padding: 20rpx 24rpx;
+.page {
+  background-color: #fff;
+  padding: 20rpx 24rpx;
 
-		::v-deep .u-input {
-			background-color: #f4f4f4;
-		}
-	}
-</style>
+  ::v-deep .u-input {
+    background-color: #f4f4f4;
+  }
+}
+</style>

pageD/resultFeedback/resultFeedback.vue

@@ -0,0 +1,157 @@
+<template>
+  <view class="page">
+    <view class="content" v-if="information.status == 0">
+      <image class="logo" src="../../static/mine/350.png" mode=""></image>
+      <view class="wait">审核中</view>
+      <view class="review">审核中，请耐心等待~</view>
+    </view>
+    <view class="content" v-else-if="information.status == 1">
+      <image class="logo" src="../../static/mine/351.png" mode=""></image>
+      <view class="wait">审核失败</view>
+      <view class="review">未通过，请重新提交信息</view>
+      <view class="refuse">拒绝原因：{{ information.refusal }}</view>
+    </view>
+    <view class="content" v-else>
+      <image class="logo" src="../../static/mine/352.png" mode=""></image>
+      <view class="wait">您已入驻成功</view>
+      <view class="prompt"
+        >请访问以下pc端地址进行店铺信息维护以及 商品信息的发布</view
+      >
+      <view class="inp">
+        <view class="url">111</view>
+        <view style="color: #f83224; font-size: 26rpx" @click="cope('1111')">
+          复制链接
+        </view>
+      </view>
+      <view class="account">
+        <view class="_label">账号：</view>
+        <view class="_value">{{ information.username }}</view>
+      </view>
+      <view class="account">
+        <view class="_label">密码：</view>
+        <view class="_value">{{ information.password }}</view>
+      </view>
+    </view>
+    <button class="go-back" @click="$router.go(-1)">返回首页</button>
+  </view>
+</template>
+
+<script>
+export default {
+  data() {
+    return {
+      code: "111",
+      information: {},
+    };
+  },
+  methods: {
+    cope(e) {
+      uni.setClipboardData({
+        data: e,
+        success() {
+          uni.showToast({
+            title: "复制成功",
+            icon: "none",
+          });
+        },
+      });
+    },
+    getInfo() {
+      uni.$u.http.post(`/api/merchant/status`).then((res) => {
+        this.information = res;
+      });
+    },
+  },
+  created() {
+    this.getInfo();
+    uni.setNavigationBarTitle({
+      title: "结果反馈",
+    });
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+.page {
+  background-color: #fff;
+  width: 100vw;
+  height: 100vh;
+  display: flex;
+  flex-direction: column;
+  justify-content: flex-start;
+  align-items: center;
+  .content {
+    display: flex;
+    flex-direction: column;
+    justify-content: flex-start;
+    align-items: center;
+    .logo {
+      width: 338rpx;
+      height: 298rpx;
+      margin: 68rpx auto;
+    }
+    .wait {
+      font-size: 36rpx;
+      color: #222;
+      font-weight: 600;
+    }
+    .review {
+      font-size: 26rpx;
+      color: rgba(34, 34, 34, 0.9);
+      margin-top: 14rpx;
+    }
+    .refuse {
+      font-size: 24rpx;
+      color: rgba(34, 34, 34, 0.6);
+      margin-top: 14rpx;
+    }
+    .prompt {
+      font-size: 28rpx;
+      color: #666;
+      margin-top: 14rpx;
+      width: 75%;
+      text-align: center;
+    }
+    .inp {
+      display: flex;
+      align-items: center;
+      justify-content: space-between;
+      background-color: #f7f7f7;
+      border-radius: 8rpx;
+      width: 530rpx;
+      height: 68rpx;
+      margin-top: 60rpx;
+      border: 1rpx solid #c3c3c3;
+      padding: 0 10rpx;
+      .url {
+        width: 80%;
+        font-size: 28rpx;
+        color: #777;
+      }
+    }
+    .account {
+      display: flex;
+      margin-top: 36rpx;
+      width: 530rpx;
+      ._label {
+        font-size: 28rpx;
+        color: #666;
+      }
+      ._value {
+        font-size: 28rpx;
+        color: #f83224;
+      }
+    }
+  }
+  .go-back {
+    background-color: #f83224;
+    color: #fff;
+    border: none;
+    border-radius: 44rpx;
+    margin-top: 90rpx;
+    width: 262rpx;
+    height: 88rpx;
+    line-height: 88rpx;
+  }
+}
+</style>

pageD/settleIn/settleIn.vue

@@ -1,113 +1,161 @@
 <template>
-	<view class="page">
-		<view class="content">
-			<u--form labelPosition="left" :model="model1" ref="uForm" labelWidth='100'>
-				<u-form-item label="姓名" prop="userInfo.name" borderBottom ref="item1">
-					<u--input inputAlign="right" v-model="model1.userInfo.name" placeholder="请输入真实姓名"
-						border="none"></u--input>
-				</u-form-item>
-				<u-form-item label="身份证号" prop="userInfo.name" borderBottom ref="item1">
-					<u--input inputAlign="right" v-model="model1.userInfo.name" type="idcard" placeholder="请输入您的身份证"
-						border="none"></u--input>
-				</u-form-item>
-				<u-form-item label="银行卡号" prop="userInfo.name" borderBottom ref="item1">
-					<u--input inputAlign="right" v-model="model1.userInfo.name" type='number' placeholder="请输入您的银行卡号"
-						border="none"></u--input>
-				</u-form-item>
-				<u-form-item label="手机号" prop="userInfo.name" borderBottom ref="item1">
-					<u--input inputAlign="right" v-model="model1.userInfo.name" type='number' placeholder="请输入手机号"
-						border="none"></u--input>
-				</u-form-item>
-				<u-form-item label="验证码" prop="userInfo.name" borderBottom ref="item1">
-					<view style="display: flex;align-items: center;">
-						<u--input inputAlign="right" v-model="model1.userInfo.name" placeholder="请输入短信验证码"
-							border="none"></u--input>
-						<view style="color: #f83224;font-weight: 600; margin-left: 50rpx;">
-							获取验证码
-						</view>
-					</view>
-				</u-form-item>
-			</u--form>
-		</view>
-		
-		<view class="bottom-1">
-			 <u-radio-group
-			    v-model="radiovalue1"
-			    placement="column"
-			    @change="groupChange"
-			  >
-			    <u-radio
-			      name="name"
-			      @change="radioChange"
-				  activeColor="red"
-			    >
-			    </u-radio>
-			  </u-radio-group>
-			 我已阅读并同意<text style="color: #f83224;">《用户服务协议》</text>和 <text style="color: #f83224;">《隐私政策》</text>
-		</view>
-		<button class="btn">开始人脸识别验证</button>
-	</view>
+  <view class="page">
+    <view class="content">
+      <u--form
+        labelPosition="left"
+        :model="model1"
+        ref="uForm"
+        labelWidth="100"
+      >
+        <u-form-item label="姓名" prop="userInfo.name" borderBottom ref="item1">
+          <u--input
+            inputAlign="right"
+            v-model="model1.name"
+            placeholder="请输入真实姓名"
+            border="none"
+          ></u--input>
+        </u-form-item>
+        <u-form-item
+          label="身份证号"
+          prop="userInfo.name"
+          borderBottom
+          ref="item1"
+        >
+          <u--input
+            inputAlign="right"
+            v-model="model1.idcard"
+            type="idcard"
+            placeholder="请输入您的身份证"
+            border="none"
+          ></u--input>
+        </u-form-item>
+        <u-form-item
+          label="银行卡号"
+          prop="userInfo.name"
+          borderBottom
+          ref="item1"
+        >
+          <u--input
+            inputAlign="right"
+            v-model="model1.card_number"
+            type="number"
+            placeholder="请输入您的银行卡号"
+            border="none"
+          ></u--input>
+        </u-form-item>
+        <u-form-item
+          label="手机号"
+          prop="userInfo.name"
+          borderBottom
+          ref="item1"
+        >
+          <u--input
+            inputAlign="right"
+            v-model="model1.phone"
+            type="number"
+            placeholder="请输入手机号"
+            border="none"
+          ></u--input>
+        </u-form-item>
+        <u-form-item label="验证码" borderBottom ref="item1">
+          <view style="display: flex; align-items: center">
+            <u--input
+              inputAlign="right"
+              v-model="model1.code"
+              placeholder="请输入短信验证码"
+              border="none"
+            ></u--input>
+            <view style="color: #f83224; font-weight: 600; margin-left: 50rpx">
+              获取验证码
+            </view>
+          </view>
+        </u-form-item>
+      </u--form>
+    </view>
+
+    <view class="bottom-1">
+      <u-radio-group
+        v-model="radiovalue1"
+        placement="column"
+        @change="groupChange"
+      >
+        <u-radio name="name" @change="radioChange" activeColor="red"> </u-radio>
+      </u-radio-group>
+      我已阅读并同意<text style="color: #f83224">《用户服务协议》</text>和
+      <text style="color: #f83224">《隐私政策》</text>
+    </view>
+    <button class="btn" @click="submit">开始人脸识别验证</button>
+  </view>
 </template>
 
 <script>
-	export default {
-		data() {
-			return {
-				model1: {
-					userInfo: {
-						name: "",
-					}
-				},
-				
-				radiovalue1:""
-			}
-		},
-		methods: {
-			radioChange(){
-				console.log(11)
-				this.value = !this.value
-			},
-			groupChange(e){
-				console.log(e)
-			}
-		},
-		mounted() {
-			uni.setNavigationBarTitle({
-				title: "团长入驻"
-			})
-		}
-	}
+export default {
+  data() {
+    return {
+      model1: {
+        name: "",
+        idcard: "",
+        phone: "",
+        card_number: "",
+        code: "",
+      },
+
+      radiovalue1: "",
+    };
+  },
+  methods: {
+    radioChange() {
+      this.value = !this.value;
+    },
+    groupChange(e) {
+      console.log(e);
+    },
+    submit() {
+      delete this.model1.code;
+      uni.$u.http.post("/api/merchant/apply", this.model1).then((res) => {
+        console.log(res);
+      });
+    },
+    getTeamStatus() {},
+  },
+  mounted() {
+    this.getTeamStatus();
+    uni.setNavigationBarTitle({
+      title: "团长入驻",
+    });
+  },
+};
 </script>
 
 <style lang="scss" scoped>
-	.page {
-		padding: 20rpx 24rpx;
+.page {
+  padding: 20rpx 24rpx;
 
-		.content {
-			padding: 0 20rpx;
-			background-color: #fff;
-			border-radius: 16rpx;
-		}
-		.bottom-1{
-			font-size: 20rpx;
-			margin-top: 68rpx;
-			color: #555;
-			display: flex;
-			justify-content: flex-start;
-			align-items: center;
-			width: 70%;
-			.radio{
-				width: 24rpx;
-				height: 24rpx;
-			}
-		}
-		.btn{
-			color: #fff;
-			background-color: #f83224;
-			border-radius: 44rpx;
-			margin-top: 28rpx;
-			height: 88rpx;
-			font-size: 32rpx;
-		}
-	}
-</style>
+  .content {
+    padding: 0 20rpx;
+    background-color: #fff;
+    border-radius: 16rpx;
+  }
+  .bottom-1 {
+    font-size: 20rpx;
+    margin-top: 68rpx;
+    color: #555;
+    display: flex;
+    justify-content: flex-start;
+    align-items: center;
+    width: 70%;
+    .radio {
+      width: 24rpx;
+      height: 24rpx;
+    }
+  }
+  .btn {
+    color: #fff;
+    background-color: #f83224;
+    border-radius: 44rpx;
+    margin-top: 28rpx;
+    height: 88rpx;
+    font-size: 32rpx;
+  }
+}
+</style>

pages.json

@@ -620,6 +620,13 @@
 					{
 						"navigationBarTitleText" : ""
 					}
+				},
+				{
+					"path" : "resultFeedback/resultFeedback",
+					"style" : 
+					{
+						"navigationBarTitleText" : ""
+					}
 				}
 
 			]

pages/mine/component/mineMoney.vue

@@ -1,127 +1,137 @@
 <template>
-	<!-- 余额组件 -->
-	<view class="mine-money" id="mine-money" :style="{'height':isTeam?'110px':'66px'}">
-		<view class="top" v-if="isTeam" @click="toEnsure">
-			<view class="content">
-				<image class="money-icon" src='../../../static/mine/308.png' mode=""></image>
-				<text>{{i18n.myDeposit}}</text>
-			</view>
-			<view class="content">200.00 <text class="right-icon"></text> </view>
-		</view>
-		<view class="bottom">
-			<view class="basis" @click="jumpBalance">
-				<view class="num">0.00</view>
-				<view class="characters">{{i18n.balance}}</view>
-			</view>
-			<view class="basis" @click="toFollow">
-				<view class="num">225</view>
-				<view class="characters">{{i18n.mineFollow}}</view>
-			</view>
-			<view class="basis" @click="toPackage">
-				<view class="num">13</view>
-				<view class="characters">{{i18n.myPackage}}</view>
-			</view>
-		</view>
-	</view>
+  <!-- 余额组件 -->
+  <view
+    class="mine-money"
+    id="mine-money"
+    :style="{ height: userInformation.merchant ? '110px' : '66px' }"
+  >
+    <view class="top" v-if="userInformation.merchant" @click="toEnsure">
+      <view class="content">
+        <image
+          class="money-icon"
+          src="../../../static/mine/308.png"
+          mode=""
+        ></image>
+        <text>{{ i18n.myDeposit }}</text>
+      </view>
+      <view class="content"
+        >{{ userInformation.deposit || 0 }} <text class="right-icon"></text>
+      </view>
+    </view>
+    <view class="bottom">
+      <view class="basis" @click="jumpBalance">
+        <view class="num">{{ userInformation.balance || 0 }}</view>
+        <view class="characters">{{ i18n.balance }}</view>
+      </view>
+      <view class="basis" @click="toFollow">
+        <view class="num">225</view>
+        <view class="characters">{{ i18n.mineFollow }}</view>
+      </view>
+      <view class="basis" @click="toPackage">
+        <view class="num">13</view>
+        <view class="characters">{{ i18n.myPackage }}</view>
+      </view>
+    </view>
+  </view>
 </template>
 
 <script>
-	export default {
-		props:{
-			isTeam:{
-				type:Boolean,
-				default:false
-			}
-		},
-		data(){
-			return{
-			}
-		},
-		computed:{
-			i18n(){
-				return this.$t('index')
-			}
-		},
-		methods:{
-			jumpBalance(){
-				uni.navigateTo({
-					url:'/pageC/accountBalance/accountBalance'
-				})
-			},
-			toEnsure(){
-				uni.navigateTo({
-					url:"/pageC/ensureMoney/ensureMoney"
-				})
-			},
-			toFollow(){
-				uni.navigateTo({
-					url:'/pageC/mineFollow/mineFollow'
-				})
-			},
-			toPackage(){
-				uni.navigateTo({
-					url:"/pageC/myPackage/myPackage"
-				})
-			}
-		},
-		created() {
-
-		}
-	}
+export default {
+  props: {
+    isTeam: {
+      type: Boolean,
+      default: false,
+    },
+    userInformation: {
+      type: Object,
+      default: {},
+    },
+  },
+  data() {
+    return {};
+  },
+  computed: {
+    i18n() {
+      return this.$t("index");
+    },
+  },
+  methods: {
+    jumpBalance() {
+      uni.navigateTo({
+        url: "/pageC/accountBalance/accountBalance",
+      });
+    },
+    toEnsure() {
+      uni.navigateTo({
+        url: "/pageC/ensureMoney/ensureMoney",
+      });
+    },
+    toFollow() {
+      uni.navigateTo({
+        url: "/pageC/mineFollow/mineFollow",
+      });
+    },
+    toPackage() {
+      uni.navigateTo({
+        url: "/pageC/myPackage/myPackage",
+      });
+    },
+  },
+  created() {},
+};
 </script>
 
 <style lang="scss">
-	.mine-money{
-		height: 110px;
-		width: 100%;
-		background-color: #3B3D55;
-		margin-top: 15px;
-		border-radius: 10px;
-		.top{
-			display: flex;
-			justify-content: space-between;
-			align-items: center;
-			color: #fff;
-			font-size: 14px;
-			height: 44px;
-			.content{
-				display: flex;
-				align-items: center;
-				margin: 0 10px;
-			}
-			.money-icon{
-				width: 18px;
-				height: 18px;
-				margin-right: 6px;
-			}
-			.right-icon{
-				display: inline-block;
-				width: 20px;
-				height: 20px;
-				background-image: url('../../../static/mine/309.png');
-				background-size: 100% 100%;
-				background-repeat: no-repeat;
-			}
-		}
-		.bottom{
-			display: flex;
-			justify-content: space-around;
-			background-color: #fff;
-			border-radius: 10px;
-			height: 66px;
-			align-items: center;
-			.num{
-				font-size: 18px;
-				color: #333;
-				text-align: center;
-				font-weight: 600;
-			}
-			.characters{
-				font-size: 13px;
-				color: #333;
-				text-align: center;
-
-			}
-		}
-	}
-</style>
+.mine-money {
+  height: 110px;
+  width: 100%;
+  background-color: #3b3d55;
+  margin-top: 15px;
+  border-radius: 10px;
+  .top {
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    color: #fff;
+    font-size: 14px;
+    height: 44px;
+    .content {
+      display: flex;
+      align-items: center;
+      margin: 0 10px;
+    }
+    .money-icon {
+      width: 18px;
+      height: 18px;
+      margin-right: 6px;
+    }
+    .right-icon {
+      display: inline-block;
+      width: 20px;
+      height: 20px;
+      background-image: url("../../../static/mine/309.png");
+      background-size: 100% 100%;
+      background-repeat: no-repeat;
+    }
+  }
+  .bottom {
+    display: flex;
+    justify-content: space-around;
+    background-color: #fff;
+    border-radius: 10px;
+    height: 66px;
+    align-items: center;
+    .num {
+      font-size: 18px;
+      color: #333;
+      text-align: center;
+      font-weight: 600;
+    }
+    .characters {
+      font-size: 13px;
+      color: #333;
+      text-align: center;
+    }
+  }
+}
+</style>

pages/mine/component/personalFunction.vue

@@ -1,86 +1,104 @@
 <template>
-	<!-- 个人功能 -->
-	<view class="team">
-		<text class="team-title">个人功能</text>
-		<view class="function-team">
-			<view class="icon-center" @click="toSetleIn">
-				<image class="form-icon" src="../../../static/mine/322.png" mode=""></image>
-				<view class="characters">成为团长</view>
-			</view>
-			<view class="icon-center">
-				<image class="form-icon" src="../../../static/mine/317.png" mode=""></image>
-				<view class="characters">联系客服</view>
-			</view>
-			<view class="icon-center" @click="toSetup">
-				<image class="form-icon" src="../../../static/mine/321.png" mode="" ></image>
-				<view class="characters">账号设置</view>
-			</view>
-		</view>
-	</view>
+  <!-- 个人功能 -->
+  <view class="team">
+    <text class="team-title">个人功能</text>
+    <view class="function-team">
+      <view class="icon-center" @click="toSetleIn">
+        <image
+          class="form-icon"
+          src="../../../static/mine/322.png"
+          mode=""
+        ></image>
+        <view class="characters">成为团长</view>
+      </view>
+      <view class="icon-center">
+        <image
+          class="form-icon"
+          src="../../../static/mine/317.png"
+          mode=""
+        ></image>
+        <view class="characters">联系客服</view>
+      </view>
+      <view class="icon-center" @click="toSetup">
+        <image
+          class="form-icon"
+          src="../../../static/mine/321.png"
+          mode=""
+        ></image>
+        <view class="characters">账号设置</view>
+      </view>
+    </view>
+  </view>
 </template>
 
 <script>
-	
-	export default {
-		data(){
-			return{
-				
-			}
-		},
-		methods:{
-			toSetup(){
-				uni.navigateTo({
-					url:"/pageC/accountSetup/accountSetup"
-				})
-			},
-			toSetleIn(){
-				uni.navigateTo({
-					url:"/pageD/settleIn/settleIn"
-				})
-			}
-		}
-	}
+export default {
+  data() {
+    return {};
+  },
+  methods: {
+    toSetup() {
+      uni.navigateTo({
+        url: "/pageC/accountSetup/accountSetup",
+      });
+    },
+    toSetleIn() {
+      uni.$u.http.post(`/api/merchant/status`).then((res) => {
+        console.log(res);
+        if (res.status == 1 || res.status == 0) {
+          uni.navigateTo({
+            url: "/pageD/resultFeedback/resultFeedback",
+          });
+        } else {
+          uni.navigateTo({
+            url: "/pageD/settleIn/settleIn",
+          });
+        }
+      });
+    },
+  },
+};
 </script>
 
 <style lang="scss">
-	.team{
-		height: 110px;
-		width: 100%;
-		background-color: #fff;
-		border-radius: 10px;
-		margin-top: 10px;
-		padding-top: 14px;
-		.team-title{
-			color: #222;
-			font-size: 14px;
-			font-weight: 600;
-			display: block;
-			margin-left: 10px;
-		}
-		.function-team{
-			display: flex;
-			flex-wrap: wrap;
-			align-items: center;
-			.icon-center{
-				width: 18%;
-				margin-top: 18px;
-				display: flex;
-				flex-wrap: wrap;
-				padding: 0 10px;
-				justify-content: center;
-				flex-direction: column;
-				align-items: center;
-			}
-			.form-icon{
-				width: 24px;
-				height: 24px;
-			}
-			
-			.characters{
-				color: #202020;
-				font-size: 12px;
-				margin-top: 10px;
-			}
-		}
-	}
-</style>
+.team {
+  height: 110px;
+  width: 100%;
+  background-color: #fff;
+  border-radius: 10px;
+  margin-top: 10px;
+  padding-top: 14px;
+  .team-title {
+    color: #222;
+    font-size: 14px;
+    font-weight: 600;
+    display: block;
+    margin-left: 10px;
+  }
+  .function-team {
+    display: flex;
+    flex-wrap: wrap;
+    align-items: center;
+    .icon-center {
+      width: 18%;
+      margin-top: 18px;
+      display: flex;
+      flex-wrap: wrap;
+      padding: 0 10px;
+      justify-content: center;
+      flex-direction: column;
+      align-items: center;
+    }
+    .form-icon {
+      width: 24px;
+      height: 24px;
+    }
+
+    .characters {
+      color: #202020;
+      font-size: 12px;
+      margin-top: 10px;
+    }
+  }
+}
+</style>

pages/mine/mine.vue

@@ -1,129 +1,136 @@
 <template>
-	<!-- 我的 -->
-	<view class="mine">
-		<!-- 头部个人信息 -->
-		<view class="mine-top">
-			<image class="header-img"
-				src="https://c-ssl.dtstatic.com/uploads/blog/202201/23/20220123222213_2899a.thumb.1000_0.jpeg" alt="" />
-			<view class="user-info">
-				<view class="name">姓名：张三</view>
-				<text class="user-id">ID:123455</text>
-			</view>
-			<view v-if="isTeam" class="user-home" @click="toHome">{{i18n.homepage}} <text class="home-right"></text> </view>
-		</view>
-		<!-- 头部个人信息 -->
-		
-		<!-- 余额组件 -->
-		<MineMoney :isTeam="isTeam" />
-		<!-- 余额组件 -->
-		
-		<!-- 商城订单 -->
-		<MallOrderForm />
-		<!-- 商城订单 -->
-		
-		<!-- 团长功能组件 -->
-		<TeamFunction v-if="isTeam" />
-		<!-- 团长功能组件 -->
-		
-		<!-- 非团长组件 -->
-		<PersonalFunction v-else />
+  <!-- 我的 -->
+  <view class="mine">
+    <!-- 头部个人信息 -->
+    <view class="mine-top">
+      <image class="header-img" :src="userInformation.avatar" alt="" />
+      <view class="user-info">
+        <view class="name">{{ userInformation.nickname }}</view>
+        <text class="user-id">ID:{{ userInformation.id }}</text>
+      </view>
+      <view v-if="isTeam" class="user-home" @click="toHome"
+        >{{ i18n.homepage }} <text class="home-right"></text>
+      </view>
+    </view>
+    <!-- 头部个人信息 -->
 
-		<!-- 底部tab栏 -->
-		<kj-tabbar :value1=4></kj-tabbar>
-		<!-- 底部tab栏 -->
-	</view>
+    <!-- 余额组件 -->
+    <MineMoney :isTeam="isTeam" :userInformation="userInformation" />
+    <!-- 余额组件 -->
+
+    <!-- 商城订单 -->
+    <MallOrderForm />
+    <!-- 商城订单 -->
+
+    <!-- 团长功能组件 -->
+    <TeamFunction v-if="userInformation.merchant" />
+    <!-- 团长功能组件 -->
+
+    <!-- 非团长组件 -->
+    <PersonalFunction v-else />
+
+    <!-- 底部tab栏 -->
+    <kj-tabbar :value1="4"></kj-tabbar>
+    <!-- 底部tab栏 -->
+  </view>
 </template>
 
 <script>
-	import MineMoney from './component/mineMoney.vue';
-	import MallOrderForm from './component/mallOrderForm.vue';
-	import TeamFunction from './component/teamFunction.vue';
-	import PersonalFunction from './component/personalFunction.vue';
-	export default {
-		components:{
-			MineMoney,
-			MallOrderForm,
-			TeamFunction,
-			PersonalFunction
-		},
-		computed:{
-			i18n(){
-				return this.$t('index')
-			}
-		},
-		data() {
-			return {
-				isTeam:true,//用来判断当前用户是不是团长
-			};
-		},
-		methods:{
-			toHome(){
-				uni.navigateTo({
-					url:"/pageD/homepage/homepage?page=false"
-				})
-			}
-		},
-		created() {
-			//设置顶部标题栏颜色
-			uni.setNavigationBarColor({
-				frontColor: '#ffffff',
-				backgroundColor: '#f4f4f4'
-			})
-		}
-	}
+import MineMoney from "./component/mineMoney.vue";
+import MallOrderForm from "./component/mallOrderForm.vue";
+import TeamFunction from "./component/teamFunction.vue";
+import PersonalFunction from "./component/personalFunction.vue";
+export default {
+  components: {
+    MineMoney,
+    MallOrderForm,
+    TeamFunction,
+    PersonalFunction,
+  },
+  computed: {
+    i18n() {
+      return this.$t("index");
+    },
+  },
+  data() {
+    return {
+      isTeam: true, //用来判断当前用户是不是团长
+      userInformation: {},
+    };
+  },
+  methods: {
+    toHome() {
+      uni.navigateTo({
+        url: "/pageD/homepage/homepage?page=false",
+      });
+    },
+    getUserInfo() {
+      uni.$u.http.get(`/api/member/info`).then((res) => {
+        this.userInformation = res;
+      });
+    },
+  },
+  created() {
+    //设置顶部标题栏颜色
+    uni.setNavigationBarColor({
+      frontColor: "#ffffff",
+      backgroundColor: "#f4f4f4",
+    });
+    this.getUserInfo();
+  },
+};
 </script>
 
 <style lang="scss">
+.mine {
+  padding-left: 10px;
+  background-color: #f4f4f4;
+  padding-right: 10px;
+  position: relative;
+}
 
-	.mine {
-		padding-left: 10px;
-		background-color: #f4f4f4;
-		padding-right: 10px;
-		position: relative;
-	}
-
-	.mine-top {
-		display: flex;
-		align-items: center;
+.mine-top {
+  display: flex;
+  align-items: center;
 
-		.header-img {
-			height: 54px;
-			width: 54px;
-			border-radius: 50%;
-			margin-right: 10px;
-		}
-		.user-info{
-			.name{
-				margin-bottom: 4px;
-				color: #222;
-				font-size: 18px;
-				font-weight: 600;
-			}
-			.user-id{
-				font-size: 12px;
-				color: #333;
-			}
-		}
-		.user-home {
-			position: absolute;
-			right: 0;
-			min-width: 72px;
-			height: 28px;
-			background-color: #eee;
-			text-align: center;
-			font-size: 13px;
-			font-size: #333;
-			line-height: 28px;
-			border-radius: 14px 0 0 14px;
-			.home-right{
-				display: inline-block;
-				width: 10px;
-				height: 10px;
-				background-image: url('../../static/mine/right.png');
-				background-size: 100% 100%;
-				background-repeat: no-repeat;
-				// margin-right: 4px;
-			}
-		}
-	}
-</style>
+  .header-img {
+    height: 54px;
+    width: 54px;
+    border-radius: 50%;
+    margin-right: 10px;
+  }
+  .user-info {
+    .name {
+      margin-bottom: 4px;
+      color: #222;
+      font-size: 18px;
+      font-weight: 600;
+    }
+    .user-id {
+      font-size: 12px;
+      color: #333;
+    }
+  }
+  .user-home {
+    position: absolute;
+    right: 0;
+    min-width: 72px;
+    height: 28px;
+    background-color: #eee;
+    text-align: center;
+    font-size: 13px;
+    font-size: #333;
+    line-height: 28px;
+    border-radius: 14px 0 0 14px;
+    .home-right {
+      display: inline-block;
+      width: 10px;
+      height: 10px;
+      background-image: url("../../static/mine/right.png");
+      background-size: 100% 100%;
+      background-repeat: no-repeat;
+      // margin-right: 4px;
+    }
+  }
+}
+</style>

unpackage/dist/dev/mp-weixin/app.json

@@ -97,7 +97,8 @@
         "evaluate/evaluate",
         "homepage/homepage",
         "ensureRecharge/ensureRecharge",
-        "orderDetail/orderDetail"
+        "orderDetail/orderDetail",
+        "resultFeedback/resultFeedback"
       ]
     }
   ],

unpackage/dist/dev/mp-weixin/common/main.js

@@ -37,6 +37,8 @@ _App.default.mpType = "app";
 var app = new _vue.default(_objectSpread({
   i18n: i18n
 }, _App.default));
+// 引入请求封装，将app参数传递到配置中
+__webpack_require__(/*! ./commont/http.interceptor.js */ 161)(app);
 createApp(app).$mount();
 /* WEBPACK VAR INJECTION */}.call(this, __webpack_require__(/*! ./node_modules/@dcloudio/uni-mp-weixin/dist/wx.js */ 1)["default"], __webpack_require__(/*! ./node_modules/@dcloudio/uni-mp-weixin/dist/index.js */ 2)["createApp"]))
 

unpackage/dist/dev/mp-weixin/pageA/index.js

@@ -1,6 +1,6 @@
 (global["webpackJsonp"] = global["webpackJsonp"] || []).push([["pageA/index"],{
 
-/***/ 212:
+/***/ 214:
 /*!**********************************************************************!*\
   !*** D:/project/crossBorder/wx-qhb/main.js?{"page":"pageA%2Findex"} ***!
   \**********************************************************************/
@@ -13,7 +13,7 @@
 var _interopRequireDefault = __webpack_require__(/*! @babel/runtime/helpers/interopRequireDefault */ 4);
 __webpack_require__(/*! uni-pages */ 26);
 var _vue = _interopRequireDefault(__webpack_require__(/*! vue */ 25));
-var _index = _interopRequireDefault(__webpack_require__(/*! ./pageA/index.vue */ 213));
+var _index = _interopRequireDefault(__webpack_require__(/*! ./pageA/index.vue */ 215));
 // @ts-ignore
 wx.__webpack_require_UNI_MP_PLUGIN__ = __webpack_require__;
 createPage(_index.default);
@@ -21,7 +21,7 @@ createPage(_index.default);
 
 /***/ }),
 
-/***/ 213:
+/***/ 215:
 /*!*****************************************************!*\
   !*** D:/project/crossBorder/wx-qhb/pageA/index.vue ***!
   \*****************************************************/
@@ -30,8 +30,8 @@ createPage(_index.default);
 
 "use strict";
 __webpack_require__.r(__webpack_exports__);
-/* harmony import */ var _index_vue_vue_type_template_id_156d5177___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ./index.vue?vue&type=template&id=156d5177& */ 214);
-/* harmony import */ var _index_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ./index.vue?vue&type=script&lang=js& */ 216);
+/* harmony import */ var _index_vue_vue_type_template_id_156d5177___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ./index.vue?vue&type=template&id=156d5177& */ 216);
+/* harmony import */ var _index_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ./index.vue?vue&type=script&lang=js& */ 218);
 /* harmony reexport (unknown) */ for(var __WEBPACK_IMPORT_KEY__ in _index_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_1__) if(["default"].indexOf(__WEBPACK_IMPORT_KEY__) < 0) (function(key) { __webpack_require__.d(__webpack_exports__, key, function() { return _index_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_1__[key]; }) }(__WEBPACK_IMPORT_KEY__));
 /* harmony import */ var _HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_runtime_componentNormalizer_js__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ../../../../工具/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib/runtime/componentNormalizer.js */ 32);
 
@@ -60,7 +60,7 @@ component.options.__file = "pageA/index.vue"
 
 /***/ }),
 
-/***/ 214:
+/***/ 216:
 /*!************************************************************************************!*\
   !*** D:/project/crossBorder/wx-qhb/pageA/index.vue?vue&type=template&id=156d5177& ***!
   \************************************************************************************/
@@ -69,7 +69,7 @@ component.options.__file = "pageA/index.vue"
 
 "use strict";
 __webpack_require__.r(__webpack_exports__);
-/* harmony import */ var _HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_loaders_templateLoader_js_vue_loader_options_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_17_0_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_template_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_uni_app_loader_page_meta_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_index_vue_vue_type_template_id_156d5177___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! -!../../../../工具/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!../../../../工具/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--17-0!../../../../工具/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/webpack-uni-mp-loader/lib/template.js!../../../../工具/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-uni-app-loader/page-meta.js!../../../../工具/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!../../../../工具/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!./index.vue?vue&type=template&id=156d5177& */ 215);
+/* harmony import */ var _HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_loaders_templateLoader_js_vue_loader_options_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_17_0_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_template_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_uni_app_loader_page_meta_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_index_vue_vue_type_template_id_156d5177___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! -!../../../../工具/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!../../../../工具/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--17-0!../../../../工具/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/webpack-uni-mp-loader/lib/template.js!../../../../工具/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-uni-app-loader/page-meta.js!../../../../工具/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!../../../../工具/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!./index.vue?vue&type=template&id=156d5177& */ 217);
 /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "render", function() { return _HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_loaders_templateLoader_js_vue_loader_options_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_17_0_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_template_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_uni_app_loader_page_meta_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_index_vue_vue_type_template_id_156d5177___WEBPACK_IMPORTED_MODULE_0__["render"]; });
 
 /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "staticRenderFns", function() { return _HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_loaders_templateLoader_js_vue_loader_options_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_17_0_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_template_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_uni_app_loader_page_meta_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_index_vue_vue_type_template_id_156d5177___WEBPACK_IMPORTED_MODULE_0__["staticRenderFns"]; });
@@ -82,7 +82,7 @@ __webpack_require__.r(__webpack_exports__);
 
 /***/ }),
 
-/***/ 215:
+/***/ 217:
 /*!************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************!*\
   !*** ./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--17-0!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/template.js!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-uni-app-loader/page-meta.js!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!D:/project/crossBorder/wx-qhb/pageA/index.vue?vue&type=template&id=156d5177& ***!
   \************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************/
@@ -109,7 +109,7 @@ render._withStripped = true
 
 /***/ }),
 
-/***/ 216:
+/***/ 218:
 /*!******************************************************************************!*\
   !*** D:/project/crossBorder/wx-qhb/pageA/index.vue?vue&type=script&lang=js& ***!
   \******************************************************************************/
@@ -118,14 +118,14 @@ render._withStripped = true
 
 "use strict";
 __webpack_require__.r(__webpack_exports__);
-/* harmony import */ var _HBuilderX_plugins_uniapp_cli_node_modules_babel_loader_lib_index_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_13_1_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_script_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_index_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! -!../../../../工具/HBuilderX/plugins/uniapp-cli/node_modules/babel-loader/lib!../../../../工具/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--13-1!../../../../工具/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/webpack-uni-mp-loader/lib/script.js!../../../../工具/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!../../../../工具/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!./index.vue?vue&type=script&lang=js& */ 217);
+/* harmony import */ var _HBuilderX_plugins_uniapp_cli_node_modules_babel_loader_lib_index_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_13_1_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_script_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_index_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! -!../../../../工具/HBuilderX/plugins/uniapp-cli/node_modules/babel-loader/lib!../../../../工具/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--13-1!../../../../工具/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/webpack-uni-mp-loader/lib/script.js!../../../../工具/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!../../../../工具/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!./index.vue?vue&type=script&lang=js& */ 219);
 /* harmony import */ var _HBuilderX_plugins_uniapp_cli_node_modules_babel_loader_lib_index_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_13_1_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_script_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_index_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(_HBuilderX_plugins_uniapp_cli_node_modules_babel_loader_lib_index_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_13_1_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_script_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_index_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_0__);
 /* harmony reexport (unknown) */ for(var __WEBPACK_IMPORT_KEY__ in _HBuilderX_plugins_uniapp_cli_node_modules_babel_loader_lib_index_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_13_1_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_script_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_index_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_0__) if(["default"].indexOf(__WEBPACK_IMPORT_KEY__) < 0) (function(key) { __webpack_require__.d(__webpack_exports__, key, function() { return _HBuilderX_plugins_uniapp_cli_node_modules_babel_loader_lib_index_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_13_1_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_script_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_index_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_0__[key]; }) }(__WEBPACK_IMPORT_KEY__));
  /* harmony default export */ __webpack_exports__["default"] = (_HBuilderX_plugins_uniapp_cli_node_modules_babel_loader_lib_index_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_13_1_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_script_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_index_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_0___default.a); 
 
 /***/ }),
 
-/***/ 217:
+/***/ 219:
 /*!*************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************!*\
   !*** ./node_modules/babel-loader/lib!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--13-1!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/script.js!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!D:/project/crossBorder/wx-qhb/pageA/index.vue?vue&type=script&lang=js& ***!
   \*************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************/
@@ -154,5 +154,5 @@ exports.default = _default;
 
 /***/ })
 
-},[[212,"common/runtime","common/vendor"]]]);
+},[[214,"common/runtime","common/vendor"]]]);
 //# sourceMappingURL=../../.sourcemap/mp-weixin/pageA/index.js.map

unpackage/dist/dev/mp-weixin/pageB/index.js

@@ -1,6 +1,6 @@
 (global["webpackJsonp"] = global["webpackJsonp"] || []).push([["pageB/index"],{
 
-/***/ 326:
+/***/ 328:
 /*!**********************************************************************!*\
   !*** D:/project/crossBorder/wx-qhb/main.js?{"page":"pageB%2Findex"} ***!
   \**********************************************************************/
@@ -13,7 +13,7 @@
 var _interopRequireDefault = __webpack_require__(/*! @babel/runtime/helpers/interopRequireDefault */ 4);
 __webpack_require__(/*! uni-pages */ 26);
 var _vue = _interopRequireDefault(__webpack_require__(/*! vue */ 25));
-var _index = _interopRequireDefault(__webpack_require__(/*! ./pageB/index.vue */ 327));
+var _index = _interopRequireDefault(__webpack_require__(/*! ./pageB/index.vue */ 329));
 // @ts-ignore
 wx.__webpack_require_UNI_MP_PLUGIN__ = __webpack_require__;
 createPage(_index.default);
@@ -21,7 +21,7 @@ createPage(_index.default);
 
 /***/ }),
 
-/***/ 327:
+/***/ 329:
 /*!*****************************************************!*\
   !*** D:/project/crossBorder/wx-qhb/pageB/index.vue ***!
   \*****************************************************/
@@ -30,8 +30,8 @@ createPage(_index.default);
 
 "use strict";
 __webpack_require__.r(__webpack_exports__);
-/* harmony import */ var _index_vue_vue_type_template_id_ab5bf790___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ./index.vue?vue&type=template&id=ab5bf790& */ 328);
-/* harmony import */ var _index_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ./index.vue?vue&type=script&lang=js& */ 330);
+/* harmony import */ var _index_vue_vue_type_template_id_ab5bf790___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ./index.vue?vue&type=template&id=ab5bf790& */ 330);
+/* harmony import */ var _index_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ./index.vue?vue&type=script&lang=js& */ 332);
 /* harmony reexport (unknown) */ for(var __WEBPACK_IMPORT_KEY__ in _index_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_1__) if(["default"].indexOf(__WEBPACK_IMPORT_KEY__) < 0) (function(key) { __webpack_require__.d(__webpack_exports__, key, function() { return _index_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_1__[key]; }) }(__WEBPACK_IMPORT_KEY__));
 /* harmony import */ var _HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_runtime_componentNormalizer_js__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ../../../../工具/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib/runtime/componentNormalizer.js */ 32);
 
@@ -60,7 +60,7 @@ component.options.__file = "pageB/index.vue"
 
 /***/ }),
 
-/***/ 328:
+/***/ 330:
 /*!************************************************************************************!*\
   !*** D:/project/crossBorder/wx-qhb/pageB/index.vue?vue&type=template&id=ab5bf790& ***!
   \************************************************************************************/
@@ -69,7 +69,7 @@ component.options.__file = "pageB/index.vue"
 
 "use strict";
 __webpack_require__.r(__webpack_exports__);
-/* harmony import */ var _HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_loaders_templateLoader_js_vue_loader_options_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_17_0_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_template_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_uni_app_loader_page_meta_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_index_vue_vue_type_template_id_ab5bf790___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! -!../../../../工具/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!../../../../工具/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--17-0!../../../../工具/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/webpack-uni-mp-loader/lib/template.js!../../../../工具/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-uni-app-loader/page-meta.js!../../../../工具/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!../../../../工具/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!./index.vue?vue&type=template&id=ab5bf790& */ 329);
+/* harmony import */ var _HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_loaders_templateLoader_js_vue_loader_options_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_17_0_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_template_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_uni_app_loader_page_meta_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_index_vue_vue_type_template_id_ab5bf790___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! -!../../../../工具/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!../../../../工具/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--17-0!../../../../工具/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/webpack-uni-mp-loader/lib/template.js!../../../../工具/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-uni-app-loader/page-meta.js!../../../../工具/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!../../../../工具/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!./index.vue?vue&type=template&id=ab5bf790& */ 331);
 /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "render", function() { return _HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_loaders_templateLoader_js_vue_loader_options_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_17_0_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_template_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_uni_app_loader_page_meta_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_index_vue_vue_type_template_id_ab5bf790___WEBPACK_IMPORTED_MODULE_0__["render"]; });
 
 /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "staticRenderFns", function() { return _HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_loaders_templateLoader_js_vue_loader_options_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_17_0_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_template_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_uni_app_loader_page_meta_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_index_vue_vue_type_template_id_ab5bf790___WEBPACK_IMPORTED_MODULE_0__["staticRenderFns"]; });
@@ -82,7 +82,7 @@ __webpack_require__.r(__webpack_exports__);
 
 /***/ }),
 
-/***/ 329:
+/***/ 331:
 /*!************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************!*\
   !*** ./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--17-0!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/template.js!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-uni-app-loader/page-meta.js!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!D:/project/crossBorder/wx-qhb/pageB/index.vue?vue&type=template&id=ab5bf790& ***!
   \************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************/
@@ -109,7 +109,7 @@ render._withStripped = true
 
 /***/ }),
 
-/***/ 330:
+/***/ 332:
 /*!******************************************************************************!*\
   !*** D:/project/crossBorder/wx-qhb/pageB/index.vue?vue&type=script&lang=js& ***!
   \******************************************************************************/
@@ -118,14 +118,14 @@ render._withStripped = true
 
 "use strict";
 __webpack_require__.r(__webpack_exports__);
-/* harmony import */ var _HBuilderX_plugins_uniapp_cli_node_modules_babel_loader_lib_index_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_13_1_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_script_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_index_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! -!../../../../工具/HBuilderX/plugins/uniapp-cli/node_modules/babel-loader/lib!../../../../工具/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--13-1!../../../../工具/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/webpack-uni-mp-loader/lib/script.js!../../../../工具/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!../../../../工具/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!./index.vue?vue&type=script&lang=js& */ 331);
+/* harmony import */ var _HBuilderX_plugins_uniapp_cli_node_modules_babel_loader_lib_index_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_13_1_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_script_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_index_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! -!../../../../工具/HBuilderX/plugins/uniapp-cli/node_modules/babel-loader/lib!../../../../工具/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--13-1!../../../../工具/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/webpack-uni-mp-loader/lib/script.js!../../../../工具/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!../../../../工具/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!./index.vue?vue&type=script&lang=js& */ 333);
 /* harmony import */ var _HBuilderX_plugins_uniapp_cli_node_modules_babel_loader_lib_index_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_13_1_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_script_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_index_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(_HBuilderX_plugins_uniapp_cli_node_modules_babel_loader_lib_index_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_13_1_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_script_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_index_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_0__);
 /* harmony reexport (unknown) */ for(var __WEBPACK_IMPORT_KEY__ in _HBuilderX_plugins_uniapp_cli_node_modules_babel_loader_lib_index_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_13_1_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_script_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_index_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_0__) if(["default"].indexOf(__WEBPACK_IMPORT_KEY__) < 0) (function(key) { __webpack_require__.d(__webpack_exports__, key, function() { return _HBuilderX_plugins_uniapp_cli_node_modules_babel_loader_lib_index_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_13_1_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_script_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_index_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_0__[key]; }) }(__WEBPACK_IMPORT_KEY__));
  /* harmony default export */ __webpack_exports__["default"] = (_HBuilderX_plugins_uniapp_cli_node_modules_babel_loader_lib_index_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_13_1_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_script_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_index_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_0___default.a); 
 
 /***/ }),
 
-/***/ 331:
+/***/ 333:
 /*!*************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************!*\
   !*** ./node_modules/babel-loader/lib!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--13-1!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/script.js!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!D:/project/crossBorder/wx-qhb/pageB/index.vue?vue&type=script&lang=js& ***!
   \*************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************/
@@ -154,5 +154,5 @@ exports.default = _default;
 
 /***/ })
 
-},[[326,"common/runtime","common/vendor"]]]);
+},[[328,"common/runtime","common/vendor"]]]);
 //# sourceMappingURL=../../.sourcemap/mp-weixin/pageB/index.js.map

unpackage/dist/dev/mp-weixin/pageC/index.js

@@ -1,6 +1,6 @@
-require('./common/vendor.js');(global["webpackJsonp"] = global["webpackJsonp"] || []).push([["pageC/index"],{
+(global["webpackJsonp"] = global["webpackJsonp"] || []).push([["pageC/index"],{
 
-/***/ 442:
+/***/ 444:
 /*!**********************************************************************!*\
   !*** D:/project/crossBorder/wx-qhb/main.js?{"page":"pageC%2Findex"} ***!
   \**********************************************************************/
@@ -13,7 +13,7 @@ require('./common/vendor.js');(global["webpackJsonp"] = global["webpackJsonp"] |
 var _interopRequireDefault = __webpack_require__(/*! @babel/runtime/helpers/interopRequireDefault */ 4);
 __webpack_require__(/*! uni-pages */ 26);
 var _vue = _interopRequireDefault(__webpack_require__(/*! vue */ 25));
-var _index = _interopRequireDefault(__webpack_require__(/*! ./pageC/index.vue */ 443));
+var _index = _interopRequireDefault(__webpack_require__(/*! ./pageC/index.vue */ 445));
 // @ts-ignore
 wx.__webpack_require_UNI_MP_PLUGIN__ = __webpack_require__;
 createPage(_index.default);
@@ -21,7 +21,7 @@ createPage(_index.default);
 
 /***/ }),
 
-/***/ 443:
+/***/ 445:
 /*!*****************************************************!*\
   !*** D:/project/crossBorder/wx-qhb/pageC/index.vue ***!
   \*****************************************************/
@@ -30,8 +30,8 @@ createPage(_index.default);
 
 "use strict";
 __webpack_require__.r(__webpack_exports__);
-/* harmony import */ var _index_vue_vue_type_template_id_3f36b6f9___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ./index.vue?vue&type=template&id=3f36b6f9& */ 444);
-/* harmony import */ var _index_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ./index.vue?vue&type=script&lang=js& */ 446);
+/* harmony import */ var _index_vue_vue_type_template_id_3f36b6f9___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ./index.vue?vue&type=template&id=3f36b6f9& */ 446);
+/* harmony import */ var _index_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ./index.vue?vue&type=script&lang=js& */ 448);
 /* harmony reexport (unknown) */ for(var __WEBPACK_IMPORT_KEY__ in _index_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_1__) if(["default"].indexOf(__WEBPACK_IMPORT_KEY__) < 0) (function(key) { __webpack_require__.d(__webpack_exports__, key, function() { return _index_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_1__[key]; }) }(__WEBPACK_IMPORT_KEY__));
 /* harmony import */ var _HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_runtime_componentNormalizer_js__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ../../../../工具/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib/runtime/componentNormalizer.js */ 32);
 
@@ -60,7 +60,7 @@ component.options.__file = "pageC/index.vue"
 
 /***/ }),
 
-/***/ 444:
+/***/ 446:
 /*!************************************************************************************!*\
   !*** D:/project/crossBorder/wx-qhb/pageC/index.vue?vue&type=template&id=3f36b6f9& ***!
   \************************************************************************************/
@@ -69,7 +69,7 @@ component.options.__file = "pageC/index.vue"
 
 "use strict";
 __webpack_require__.r(__webpack_exports__);
-/* harmony import */ var _HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_loaders_templateLoader_js_vue_loader_options_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_17_0_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_template_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_uni_app_loader_page_meta_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_index_vue_vue_type_template_id_3f36b6f9___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! -!../../../../工具/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!../../../../工具/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--17-0!../../../../工具/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/webpack-uni-mp-loader/lib/template.js!../../../../工具/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-uni-app-loader/page-meta.js!../../../../工具/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!../../../../工具/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!./index.vue?vue&type=template&id=3f36b6f9& */ 445);
+/* harmony import */ var _HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_loaders_templateLoader_js_vue_loader_options_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_17_0_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_template_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_uni_app_loader_page_meta_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_index_vue_vue_type_template_id_3f36b6f9___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! -!../../../../工具/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!../../../../工具/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--17-0!../../../../工具/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/webpack-uni-mp-loader/lib/template.js!../../../../工具/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-uni-app-loader/page-meta.js!../../../../工具/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!../../../../工具/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!./index.vue?vue&type=template&id=3f36b6f9& */ 447);
 /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "render", function() { return _HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_loaders_templateLoader_js_vue_loader_options_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_17_0_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_template_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_uni_app_loader_page_meta_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_index_vue_vue_type_template_id_3f36b6f9___WEBPACK_IMPORTED_MODULE_0__["render"]; });
 
 /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "staticRenderFns", function() { return _HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_loaders_templateLoader_js_vue_loader_options_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_17_0_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_template_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_uni_app_loader_page_meta_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_index_vue_vue_type_template_id_3f36b6f9___WEBPACK_IMPORTED_MODULE_0__["staticRenderFns"]; });
@@ -82,7 +82,7 @@ __webpack_require__.r(__webpack_exports__);
 
 /***/ }),
 
-/***/ 445:
+/***/ 447:
 /*!************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************!*\
   !*** ./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--17-0!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/template.js!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-uni-app-loader/page-meta.js!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!D:/project/crossBorder/wx-qhb/pageC/index.vue?vue&type=template&id=3f36b6f9& ***!
   \************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************/
@@ -109,7 +109,7 @@ render._withStripped = true
 
 /***/ }),
 
-/***/ 446:
+/***/ 448:
 /*!******************************************************************************!*\
   !*** D:/project/crossBorder/wx-qhb/pageC/index.vue?vue&type=script&lang=js& ***!
   \******************************************************************************/
@@ -118,14 +118,14 @@ render._withStripped = true
 
 "use strict";
 __webpack_require__.r(__webpack_exports__);
-/* harmony import */ var _HBuilderX_plugins_uniapp_cli_node_modules_babel_loader_lib_index_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_13_1_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_script_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_index_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! -!../../../../工具/HBuilderX/plugins/uniapp-cli/node_modules/babel-loader/lib!../../../../工具/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--13-1!../../../../工具/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/webpack-uni-mp-loader/lib/script.js!../../../../工具/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!../../../../工具/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!./index.vue?vue&type=script&lang=js& */ 447);
+/* harmony import */ var _HBuilderX_plugins_uniapp_cli_node_modules_babel_loader_lib_index_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_13_1_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_script_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_index_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! -!../../../../工具/HBuilderX/plugins/uniapp-cli/node_modules/babel-loader/lib!../../../../工具/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--13-1!../../../../工具/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/webpack-uni-mp-loader/lib/script.js!../../../../工具/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!../../../../工具/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!./index.vue?vue&type=script&lang=js& */ 449);
 /* harmony import */ var _HBuilderX_plugins_uniapp_cli_node_modules_babel_loader_lib_index_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_13_1_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_script_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_index_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(_HBuilderX_plugins_uniapp_cli_node_modules_babel_loader_lib_index_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_13_1_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_script_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_index_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_0__);
 /* harmony reexport (unknown) */ for(var __WEBPACK_IMPORT_KEY__ in _HBuilderX_plugins_uniapp_cli_node_modules_babel_loader_lib_index_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_13_1_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_script_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_index_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_0__) if(["default"].indexOf(__WEBPACK_IMPORT_KEY__) < 0) (function(key) { __webpack_require__.d(__webpack_exports__, key, function() { return _HBuilderX_plugins_uniapp_cli_node_modules_babel_loader_lib_index_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_13_1_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_script_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_index_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_0__[key]; }) }(__WEBPACK_IMPORT_KEY__));
  /* harmony default export */ __webpack_exports__["default"] = (_HBuilderX_plugins_uniapp_cli_node_modules_babel_loader_lib_index_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_13_1_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_script_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_index_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_0___default.a); 
 
 /***/ }),
 
-/***/ 447:
+/***/ 449:
 /*!*************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************!*\
   !*** ./node_modules/babel-loader/lib!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--13-1!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/script.js!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!D:/project/crossBorder/wx-qhb/pageC/index.vue?vue&type=script&lang=js& ***!
   \*************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************/
@@ -155,5 +155,5 @@ exports.default = _default;
 
 /***/ })
 
-},[[442,"common/runtime","common/vendor"]]]);
+},[[444,"common/runtime","common/vendor"]]]);
 //# sourceMappingURL=../../.sourcemap/mp-weixin/pageC/index.js.map

unpackage/dist/dev/mp-weixin/pageD/index.js

@@ -1,6 +1,6 @@
 (global["webpackJsonp"] = global["webpackJsonp"] || []).push([["pageD/index"],{
 
-/***/ 630:
+/***/ 632:
 /*!**********************************************************************!*\
   !*** D:/project/crossBorder/wx-qhb/main.js?{"page":"pageD%2Findex"} ***!
   \**********************************************************************/
@@ -13,7 +13,7 @@
 var _interopRequireDefault = __webpack_require__(/*! @babel/runtime/helpers/interopRequireDefault */ 4);
 __webpack_require__(/*! uni-pages */ 26);
 var _vue = _interopRequireDefault(__webpack_require__(/*! vue */ 25));
-var _index = _interopRequireDefault(__webpack_require__(/*! ./pageD/index.vue */ 631));
+var _index = _interopRequireDefault(__webpack_require__(/*! ./pageD/index.vue */ 633));
 // @ts-ignore
 wx.__webpack_require_UNI_MP_PLUGIN__ = __webpack_require__;
 createPage(_index.default);
@@ -21,7 +21,7 @@ createPage(_index.default);
 
 /***/ }),
 
-/***/ 631:
+/***/ 633:
 /*!*****************************************************!*\
   !*** D:/project/crossBorder/wx-qhb/pageD/index.vue ***!
   \*****************************************************/
@@ -30,8 +30,8 @@ createPage(_index.default);
 
 "use strict";
 __webpack_require__.r(__webpack_exports__);
-/* harmony import */ var _index_vue_vue_type_template_id_57c92c8c___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ./index.vue?vue&type=template&id=57c92c8c& */ 632);
-/* harmony import */ var _index_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ./index.vue?vue&type=script&lang=js& */ 634);
+/* harmony import */ var _index_vue_vue_type_template_id_57c92c8c___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ./index.vue?vue&type=template&id=57c92c8c& */ 634);
+/* harmony import */ var _index_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ./index.vue?vue&type=script&lang=js& */ 636);
 /* harmony reexport (unknown) */ for(var __WEBPACK_IMPORT_KEY__ in _index_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_1__) if(["default"].indexOf(__WEBPACK_IMPORT_KEY__) < 0) (function(key) { __webpack_require__.d(__webpack_exports__, key, function() { return _index_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_1__[key]; }) }(__WEBPACK_IMPORT_KEY__));
 /* harmony import */ var _HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_runtime_componentNormalizer_js__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ../../../../工具/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib/runtime/componentNormalizer.js */ 32);
 
@@ -60,7 +60,7 @@ component.options.__file = "pageD/index.vue"
 
 /***/ }),
 
-/***/ 632:
+/***/ 634:
 /*!************************************************************************************!*\
   !*** D:/project/crossBorder/wx-qhb/pageD/index.vue?vue&type=template&id=57c92c8c& ***!
   \************************************************************************************/
@@ -69,7 +69,7 @@ component.options.__file = "pageD/index.vue"
 
 "use strict";
 __webpack_require__.r(__webpack_exports__);
-/* harmony import */ var _HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_loaders_templateLoader_js_vue_loader_options_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_17_0_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_template_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_uni_app_loader_page_meta_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_index_vue_vue_type_template_id_57c92c8c___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! -!../../../../工具/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!../../../../工具/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--17-0!../../../../工具/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/webpack-uni-mp-loader/lib/template.js!../../../../工具/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-uni-app-loader/page-meta.js!../../../../工具/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!../../../../工具/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!./index.vue?vue&type=template&id=57c92c8c& */ 633);
+/* harmony import */ var _HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_loaders_templateLoader_js_vue_loader_options_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_17_0_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_template_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_uni_app_loader_page_meta_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_index_vue_vue_type_template_id_57c92c8c___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! -!../../../../工具/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!../../../../工具/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--17-0!../../../../工具/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/webpack-uni-mp-loader/lib/template.js!../../../../工具/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-uni-app-loader/page-meta.js!../../../../工具/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!../../../../工具/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!./index.vue?vue&type=template&id=57c92c8c& */ 635);
 /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "render", function() { return _HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_loaders_templateLoader_js_vue_loader_options_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_17_0_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_template_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_uni_app_loader_page_meta_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_index_vue_vue_type_template_id_57c92c8c___WEBPACK_IMPORTED_MODULE_0__["render"]; });
 
 /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "staticRenderFns", function() { return _HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_loaders_templateLoader_js_vue_loader_options_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_17_0_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_template_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_uni_app_loader_page_meta_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_index_vue_vue_type_template_id_57c92c8c___WEBPACK_IMPORTED_MODULE_0__["staticRenderFns"]; });
@@ -82,7 +82,7 @@ __webpack_require__.r(__webpack_exports__);
 
 /***/ }),
 
-/***/ 633:
+/***/ 635:
 /*!************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************!*\
   !*** ./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--17-0!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/template.js!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-uni-app-loader/page-meta.js!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!D:/project/crossBorder/wx-qhb/pageD/index.vue?vue&type=template&id=57c92c8c& ***!
   \************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************/
@@ -109,7 +109,7 @@ render._withStripped = true
 
 /***/ }),
 
-/***/ 634:
+/***/ 636:
 /*!******************************************************************************!*\
   !*** D:/project/crossBorder/wx-qhb/pageD/index.vue?vue&type=script&lang=js& ***!
   \******************************************************************************/
@@ -118,14 +118,14 @@ render._withStripped = true
 
 "use strict";
 __webpack_require__.r(__webpack_exports__);
-/* harmony import */ var _HBuilderX_plugins_uniapp_cli_node_modules_babel_loader_lib_index_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_13_1_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_script_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_index_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! -!../../../../工具/HBuilderX/plugins/uniapp-cli/node_modules/babel-loader/lib!../../../../工具/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--13-1!../../../../工具/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/webpack-uni-mp-loader/lib/script.js!../../../../工具/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!../../../../工具/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!./index.vue?vue&type=script&lang=js& */ 635);
+/* harmony import */ var _HBuilderX_plugins_uniapp_cli_node_modules_babel_loader_lib_index_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_13_1_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_script_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_index_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! -!../../../../工具/HBuilderX/plugins/uniapp-cli/node_modules/babel-loader/lib!../../../../工具/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--13-1!../../../../工具/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/webpack-uni-mp-loader/lib/script.js!../../../../工具/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!../../../../工具/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!./index.vue?vue&type=script&lang=js& */ 637);
 /* harmony import */ var _HBuilderX_plugins_uniapp_cli_node_modules_babel_loader_lib_index_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_13_1_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_script_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_index_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(_HBuilderX_plugins_uniapp_cli_node_modules_babel_loader_lib_index_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_13_1_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_script_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_index_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_0__);
 /* harmony reexport (unknown) */ for(var __WEBPACK_IMPORT_KEY__ in _HBuilderX_plugins_uniapp_cli_node_modules_babel_loader_lib_index_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_13_1_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_script_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_index_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_0__) if(["default"].indexOf(__WEBPACK_IMPORT_KEY__) < 0) (function(key) { __webpack_require__.d(__webpack_exports__, key, function() { return _HBuilderX_plugins_uniapp_cli_node_modules_babel_loader_lib_index_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_13_1_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_script_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_index_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_0__[key]; }) }(__WEBPACK_IMPORT_KEY__));
  /* harmony default export */ __webpack_exports__["default"] = (_HBuilderX_plugins_uniapp_cli_node_modules_babel_loader_lib_index_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_13_1_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_script_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_index_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_0___default.a); 
 
 /***/ }),
 
-/***/ 635:
+/***/ 637:
 /*!*************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************!*\
   !*** ./node_modules/babel-loader/lib!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--13-1!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/script.js!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!D:/project/crossBorder/wx-qhb/pageD/index.vue?vue&type=script&lang=js& ***!
   \*************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************/
@@ -153,5 +153,5 @@ exports.default = _default;
 
 /***/ })
 
-},[[630,"common/runtime","common/vendor"]]]);
+},[[632,"common/runtime","common/vendor"]]]);
 //# sourceMappingURL=../../.sourcemap/mp-weixin/pageD/index.js.map

unpackage/dist/dev/mp-weixin/pages/mine/mine.wxml

@@ -1 +1 @@
-<view class="mine"><view class="mine-top"><image class="header-img" src="https://c-ssl.dtstatic.com/uploads/blog/202201/23/20220123222213_2899a.thumb.1000_0.jpeg" alt></image><view class="user-info"><view class="name">姓名：张三</view><text class="user-id">ID:123455</text></view><block wx:if="{{isTeam}}"><view data-event-opts="{{[['tap',[['toHome',['$event']]]]]}}" class="user-home" bindtap="__e">{{i18n.homepage+''}}<text class="home-right"></text></view></block></view><mine-money vue-id="bae1c640-1" isTeam="{{isTeam}}" bind:__l="__l"></mine-money><mall-order-form vue-id="bae1c640-2" bind:__l="__l"></mall-order-form><block wx:if="{{isTeam}}"><team-function vue-id="bae1c640-3" bind:__l="__l"></team-function></block><block wx:else><personal-function vue-id="bae1c640-4" bind:__l="__l"></personal-function></block><kj-tabbar vue-id="bae1c640-5" value1="{{4}}" bind:__l="__l"></kj-tabbar></view>
+<view class="mine"><view class="mine-top"><image class="header-img" src="{{userInformation.avatar}}" alt></image><view class="user-info"><view class="name">{{userInformation.nickname}}</view><text class="user-id">{{"ID:"+userInformation.id}}</text></view><block wx:if="{{isTeam}}"><view data-event-opts="{{[['tap',[['toHome',['$event']]]]]}}" class="user-home" bindtap="__e">{{i18n.homepage+''}}<text class="home-right"></text></view></block></view><mine-money vue-id="bae1c640-1" isTeam="{{isTeam}}" userInformation="{{userInformation}}" bind:__l="__l"></mine-money><mall-order-form vue-id="bae1c640-2" bind:__l="__l"></mall-order-form><block wx:if="{{userInformation.merchant}}"><team-function vue-id="bae1c640-3" bind:__l="__l"></team-function></block><block wx:else><personal-function vue-id="bae1c640-4" bind:__l="__l"></personal-function></block><kj-tabbar vue-id="bae1c640-5" value1="{{4}}" bind:__l="__l"></kj-tabbar></view>