更新代码

components/lb-picker/pickers/multi-selector-picker.vue

@@ -1,16 +1,21 @@
 <template>
   <view class="multi-selector picker-item"
-    :style="{height: height}">
+    :style="{ height: height }">
     <picker-view :value="pickerValue"
       :indicator-style="indicatorStyle"
-      :style="{height: height}"
+      :style="{ height: height }"
       @change="handleChange">
       <picker-view-column v-for="(column, index) in pickerColumns"
         :key="index">
-        <view v-for="(item, i) in column"
-          :class="['lb-picker-column', item[props.value] === selectValue[index] ? 'lb-picker-column-active' : '']"
+        <view v-for="(item, i) in column || []"
+          :class="[
+            'lb-picker-column',
+            item[props.value] === selectValue[index]
+              ? 'lb-picker-column-active'
+              : ''
+          ]"
           :key="i"
-          :style="{height: columnHeight, 'line-height': columnHeight}">
+          :style="{ height: columnHeight, 'line-height': columnHeight }">
           <view class="lb-picker-column-label">
             {{ item[props.label] }}
           </view>
@@ -24,92 +29,103 @@
 import { getIndicatorHeight } from '../utils.js'
 const indicatorHeight = getIndicatorHeight()
 export default {
-	props: {
-		value: Array,
-		list: Array,
-		props: Object,
-		level: Number,
-		keep: {
-			type: Boolean,
-			default: true
-		},
-		visible: Boolean,
-		height: String
-	},
-	data() {
-		return {
-			pickerValue: [],
-			pickerColumns: [],
-			selectValue: [],
-			selectItem: [],
-			columnHeight: indicatorHeight + 'px',
-			indicatorStyle: `height: ${indicatorHeight}px`
-		}
-	},
-	created () {
-		this.init()
-	},
-	methods: {
-		init () {
-			this.setPickerItems(this.list)
-			this.$emit('change', {
-				value: this.selectValue,
-				item: this.selectItem,
-				index: this.pickerValue,
-				init: true
-			})
-		},
-		handleChange (item) {
-			const pickerValue = item.detail.value
-			const columnIndex = pickerValue.findIndex((item, i) => item !== this.pickerValue[i] )
-			const valueIndex = pickerValue[columnIndex]
-			this.setPickerChange(pickerValue, valueIndex, columnIndex)
-		},
-		setPickerChange (pickerValue, valueIndex, columnIndex) {
-			for (let i = 0; i < pickerValue.length; i++) {
-				if (i > columnIndex) {
-					pickerValue[i] = 0
-					const column = this.pickerColumns[i-1][valueIndex] || this.pickerColumns[i-1][0]
-					this.$set(this.pickerColumns, i, column[this.props.children] || [])
+  props: {
+    value: Array,
+    list: Array,
+    props: Object,
+    level: Number,
+    visible: Boolean,
+    height: String
+  },
+  data () {
+    return {
+      pickerValue: [],
+      pickerColumns: [],
+      selectValue: [],
+      selectItem: [],
+      columnHeight: indicatorHeight + 'px',
+      indicatorStyle: `height: ${indicatorHeight}px`
+    }
+  },
+  created () {
+    this.init('init')
+  },
+  methods: {
+    init (changeType) {
+      this.setPickerItems(this.list)
+      this.$emit('change', {
+        value: this.selectValue,
+        item: this.selectItem,
+        index: this.pickerValue,
+        change: changeType
+      })
+    },
+    handleChange (item) {
+      const pickerValue = item.detail.value
+      const columnIndex = pickerValue.findIndex(
+        (item, i) => item !== this.pickerValue[i]
+      )
+      const valueIndex = pickerValue[columnIndex]
+      this.setPickerChange(pickerValue, valueIndex, columnIndex)
+    },
+    setPickerChange (pickerValue, valueIndex, columnIndex) {
+      for (let i = 0; i < this.level; i++) {
+        if (i > columnIndex) {
+          pickerValue[i] = 0
+          const column =
+            this.pickerColumns[i - 1][valueIndex] ||
+            this.pickerColumns[i - 1][0]
+          this.$set(this.pickerColumns, i, column[this.props.children] || [])
           valueIndex = 0
-				}
-				this.selectItem[i] = this.pickerColumns[i][pickerValue[i]]
-				this.selectValue[i] = this.selectItem[i][this.props.value]
-			}
-			this.pickerValue = pickerValue
-			this.$emit('change', {
-				value: this.selectValue,
-				item: this.selectItem,
-				index: this.pickerValue
-			})
-		},
-		setPickerItems (list = [], index = 0) {
-			const defaultValue = this.value || []
-			if (index < this.level && list.length) {
-				const value = defaultValue[index] || ''
-				let i = list.findIndex(item => item[this.props.value] === value)
-				i = i > -1 ? i : 0
-				this.$set(this.pickerValue, index, i)
-				this.$set(this.pickerColumns, index, list)
-				this.$set(this.selectValue, index, list[i][this.props.value])
-				this.$set(this.selectItem, index, list[i])
-				this.setPickerItems(list[i][this.props.children] || [], index + 1)
-			}
-		}
-	},
-	watch: {
-		visible (newVisible) {
-			if (newVisible && !this.keep) {
-				this.init()	
-			}
-		},
-		list () {
-			this.init()
-		}	
-	}
+        }
+        this.pickerValue = pickerValue
+        this.selectItem[i] = this.pickerColumns[i][pickerValue[i]]
+        if (this.selectItem[i]) {
+          this.selectValue[i] = this.selectItem[i][this.props.value]
+        } else {
+          const spliceNum = this.level - i
+          this.pickerValue.splice(i, spliceNum)
+          this.selectValue.splice(i, spliceNum)
+          this.selectItem.splice(i, spliceNum)
+          this.pickerColumns.splice(i, spliceNum)
+          break
+        }
+      }
+      this.$emit('change', {
+        value: this.selectValue,
+        item: this.selectItem,
+        index: this.pickerValue,
+        change: 'scroll'
+      })
+    },
+    setPickerItems (list = [], index = 0) {
+      if (!list.length) return
+      const defaultValue = this.value || []
+      if (index < this.level) {
+        const value = defaultValue[index] || ''
+        let i = list.findIndex(item => item[this.props.value] === value)
+        i = i > -1 ? i : 0
+        this.$set(this.pickerValue, index, i)
+        this.$set(this.pickerColumns, index, list)
+        if (list[i]) {
+          this.$set(this.selectValue, index, list[i][this.props.value])
+          this.$set(this.selectItem, index, list[i])
+          this.setPickerItems(list[i][this.props.children] || [], index + 1)
+        }
+      }
+    }
+  },
+  watch: {
+    value (newVal) {
+      this.init('value')
+    },
+    list () {
+      this.init('list')
+    }
+  }
 }
 </script>
 
 <style lang="scss" scoped>
 @import "../style/picker-item.scss";
-</style>
+</style>

components/lb-picker/pickers/selector-picker.vue

@@ -1,17 +1,22 @@
 <template>
   <view class="selector-picker picker-item"
-    :style="{height: height}">
+    :style="{ height: height }">
     <picker-view :value="pickerValue"
       :indicator-style="indicatorStyle"
-      :style="{height: height}"
+      :style="{ height: height }"
       @change="handleChange">
       <picker-view-column>
         <view v-for="(item, i) in list"
-          :class="['lb-picker-column', item[props.value] === selectValue ? 'lb-picker-column-active' : '']"
+          :class="[
+            'lb-picker-column',
+            item[props.value] || item === selectValue
+              ? 'lb-picker-column-active'
+              : ''
+          ]"
           :key="i"
-          :style="{height: columnHeight, lineHeight: columnHeight}">
+          :style="{ height: columnHeight, lineHeight: columnHeight }">
           <view class="lb-picker-column-label">
-            {{ item[props.label] }}
+            {{ item[props.label] || item }}
           </view>
         </view>
       </picker-view-column>
@@ -20,60 +25,75 @@
 </template>
 
 <script>
-import { getIndicatorHeight } from '../utils.js'
+import { getIndicatorHeight, isObject } from '../utils.js'
 const indicatorHeight = getIndicatorHeight()
 export default {
-	props: {
-		value: [String, Number],
-		list: Array,
-		props: Object,
-		visible: Boolean,
-		height: String
-	},
-	data(){
-		return {
-			pickerValue: [],
-			selectValue: '',
-			columnHeight: indicatorHeight + 'px',
+  props: {
+    value: [String, Number],
+    list: Array,
+    props: Object,
+    visible: Boolean,
+    height: String
+  },
+  data () {
+    return {
+      pickerValue: [],
+      selectValue: '',
+      columnHeight: indicatorHeight + 'px',
       indicatorStyle: `height: ${indicatorHeight}px`
-		}
-	},
-	created () {
-		this.init()
-	},
-	methods: {
-		init () {
-			if (this.list && this.list.length) {
-				let index = this.list.findIndex(item => item[this.props.value] === this.value)
-				index = index > -1 ? index : 0
-				this.pickerValue = [index]
-				this.selectValue = this.list[index][this.props.value]
-				this.$emit('change', {
-					value: this.selectValue,
-					item: this.list[index],
-					index: index
-				})
-			}
-		},
-		handleChange (item) {
-			const index = item.detail.value[0] || 0
-			this.selectValue = this.list[index][this.props.value]
-			this.pickerValue = item.detail.value
-			this.$emit('change', {
-				value: this.selectValue,
-				item: this.list[index],
-				index: index
-			})
-		}
-	},
-	watch: {
-		list () {
-			this.init()
-		}	
-	}
+    }
+  },
+  created () {
+    this.init('init')
+  },
+  methods: {
+    init (changeType) {
+      if (this.list && this.list.length) {
+        let index = this.list.findIndex(item => {
+          return isObject(item)
+            ? item[this.props.value] === this.value
+            : item === this.value
+        })
+        index = index > -1 ? index : 0
+        const listItem = this.list[index]
+        this.pickerValue = [index]
+        this.selectValue = isObject(listItem)
+          ? listItem[this.props.value]
+          : listItem
+        this.$emit('change', {
+          value: this.selectValue,
+          item: listItem,
+          index: index,
+          change: changeType
+        })
+      }
+    },
+    handleChange (item) {
+      const index = item.detail.value[0] || 0
+      const listItem = this.list[index]
+      this.selectValue = isObject(listItem)
+        ? listItem[this.props.value]
+        : listItem
+      this.pickerValue = item.detail.value
+      this.$emit('change', {
+        value: this.selectValue,
+        item: listItem,
+        index: index,
+        change: 'scroll'
+      })
+    }
+  },
+  watch: {
+    list () {
+      this.init('list')
+    },
+    value (newVal) {
+      this.init('value')
+    }
+  }
 }
 </script>
 
 <style lang="scss" scoped>
 @import "../style/picker-item.scss";
-</style>
+</style>

components/lb-picker/pickers/unlinked-selector-picker.vue

@@ -1,18 +1,23 @@
 <template>
   <view class="selector-picker picker-item"
-    :style="{height: height}">
+    :style="{ height: height }">
     <picker-view :value="pickerValue"
       :indicator-style="indicatorStyle"
-      :style="{height: height}"
+      :style="{ height: height }"
       @change="handleChange">
       <picker-view-column v-for="(column, index) in pickerColumns"
         :key="index">
         <view v-for="(item, i) in column"
-          :class="['lb-picker-column', item[props.value] === selectValue[index] ? 'lb-picker-column-active' : '']"
+          :class="[
+            'lb-picker-column',
+            item[props.value] || item === selectValue[index]
+              ? 'lb-picker-column-active'
+              : ''
+          ]"
           :key="i"
-          :style="{height: columnHeight, 'line-height': columnHeight}">
+          :style="{ height: columnHeight, 'line-height': columnHeight }">
           <view class="lb-picker-column-label">
-            {{ item[props.label] }}
+            {{ item[props.label] || item }}
           </view>
         </view>
       </picker-view-column>
@@ -21,74 +26,95 @@
 </template>
 
 <script>
-import { getIndicatorHeight } from '../utils.js'
+import { getIndicatorHeight, isObject } from '../utils.js'
 const indicatorHeight = getIndicatorHeight()
 export default {
-	props: {
-		value: Array,
-		list: Array,
-		props: Object,
-		visible: Boolean,
-		height: String,
-		indicatorHeight: Number
-	},
-	data(){
-		return {
-			pickerValue: [],
-			pickerColumns: [],
-			selectValue: [],
-			selectItem: [],
-			columnHeight: indicatorHeight + 'px',
+  props: {
+    value: Array,
+    list: Array,
+    props: Object,
+    visible: Boolean,
+    height: String,
+    indicatorHeight: Number
+  },
+  data () {
+    return {
+      pickerValue: [],
+      pickerColumns: [],
+      selectValue: [],
+      selectItem: [],
+      columnHeight: indicatorHeight + 'px',
       indicatorStyle: `height: ${indicatorHeight}px`
-		}
-	},
-	created () {
-		this.init()
-	},
-	methods: {
-		init () {
-			if (this.list && this.list.length) {
-				this.pickerColumns = this.list
-				this.setPickerValue()
-				this.$emit('change', {
-					value: this.selectValue,
-					item: this.selectItem,
-					index: this.pickerValue
-				})
-			}
-		},
-		setPickerValue (value) {
-			this.list.forEach((item, i) => {
-				let index = item.findIndex(item => item[this.props.value] === this.value[i])
-				index = index > -1 ? index : 0
-				this.$set(this.pickerValue, i, index)
-				this.$set(this.selectValue, i, this.list[i][index][this.props.value])
-				this.$set(this.selectItem, i, this.list[i][index])
-			})
-		},
+    }
+  },
+  created () {
+    this.init('init')
+  },
+  methods: {
+    init (changeType) {
+      if (this.list && this.list.length) {
+        this.pickerColumns = this.list
+        this.setPickerValue()
+        this.$emit('change', {
+          value: this.selectValue,
+          item: this.selectItem,
+          index: this.pickerValue,
+          change: changeType
+        })
+      }
+    },
+    setPickerValue (value) {
+      this.list.forEach((item, i) => {
+        let index = item.findIndex(item => {
+          return isObject(item)
+            ? item[this.props.value] === this.value[i]
+            : item === this.value[i]
+        })
+        index = index > -1 ? index : 0
+        const columnItem = this.list[i][index]
+        const valueItem = isObject(columnItem)
+          ? columnItem[this.props.value]
+          : columnItem
+        this.$set(this.pickerValue, i, index)
+        this.$set(this.selectValue, i, valueItem)
+        this.$set(this.selectItem, i, columnItem)
+      })
+    },
 
-		handleChange (item) {
-			const pickerValue = item.detail.value
-			const columnIndex = pickerValue.findIndex((item, i) => item !== this.pickerValue[i] )
-			const valueIndex = pickerValue[columnIndex]
-			this.pickerValue = pickerValue
-			this.$set(this.selectValue, columnIndex, this.list[columnIndex][valueIndex][this.props.value])
-			this.$set(this.selectItem, columnIndex, this.list[columnIndex][valueIndex])
-			this.$emit('change', {
-				value: this.selectValue,
-				item: this.selectItem,
-				index: this.pickerValue
-			})
-		}
-	},
-	watch: {
-		list () {
-			this.init()
-		}	
-	}
+    handleChange (item) {
+      const pickerValue = item.detail.value
+      const columnIndex = pickerValue.findIndex(
+        (item, i) => item !== this.pickerValue[i]
+      )
+      if (columnIndex > -1) {
+        const valueIndex = pickerValue[columnIndex]
+        const columnItem = this.list[columnIndex][valueIndex]
+        const valueItem = isObject(columnItem)
+          ? columnItem[this.props.value]
+          : columnItem
+        this.pickerValue = pickerValue
+        this.$set(this.selectValue, columnIndex, valueItem)
+        this.$set(this.selectItem, columnIndex, columnItem)
+        this.$emit('change', {
+          value: this.selectValue,
+          item: this.selectItem,
+          index: this.pickerValue,
+          change: 'scroll'
+        })
+      }
+    }
+  },
+  watch: {
+    list () {
+      this.init('list')
+    },
+    value (newVal) {
+      this.init('value')
+    }
+  }
 }
 </script>
 
 <style lang="scss" scoped>
 @import "../style/picker-item.scss";
-</style>
+</style>

components/lb-picker/style/picker-item.scss

@@ -1,4 +1,15 @@
 .picker-item {
+	picker-view-column {
+		transition: all 0.3s;
+	}
+
+	.lb-picker-column-flex0 {
+		flex: 0;
+	}
+
+	.lb-picker-column-flex1 {
+		flex: 1;
+	}
 
 	.lb-picker-column {
 		padding: 0;

components/lb-picker/style/picker.scss

@@ -58,8 +58,8 @@
 				display: flex;
 				align-items: center;
 
-				.lb-picker-action-cancle {
-					color: #999999;
+				.lb-picker-action-cancel {
+					color: #999;
 				}
 
 				.lb-picker-action-confirm {
@@ -71,7 +71,7 @@
 		.lb-picker-content {
 			position: relative;
 			width: 100%;
-			background-color: $uni-bg-color;
+			background-color: #fff;
 			font-size: 32rpx;
 
 			.uni-picker-view-indicator {
@@ -80,12 +80,15 @@
 				}
 			}
 
-			.lb-picker-loading {
+			.lb-picker-loading,
+			.lb-picker-empty {
 				height: 100%;
 				display: flex;
 				justify-content: center;
 				align-items: center;
+			}
 
+			.lb-picker-loading {
 				.lb-picker-loading-img {
 					width: 64rpx;
 					height: 64rpx;
@@ -95,6 +98,23 @@
 					animation: rotating 2s linear infinite;
 				}
 			}
+
+			.lb-picker-empty {
+				font-size: 32rpx;
+
+				.lb-picker-empty-text {
+					color: #999;
+				}
+			}
+		}
+	}
+
+	&.lb-picker-inline {
+		.lb-picker-container {
+			position: relative;
+			visibility: visible;
+			box-shadow: unset;
+			transform: translateY(0);
 		}
 	}
 }

components/lb-picker/utils.js

@@ -1,5 +1,5 @@
-export function isArray (val) {
-  return Object.prototype.toString.call(val) === '[object Array]'
+export function isObject (val) {
+  return Object.prototype.toString.call(val) === '[object Object]'
 }
 
 export function getIndicatorHeight () {

main.js

@@ -3,11 +3,13 @@ import App from './App'
 import http from './utils/request.js'
 import date from './utils/prototype.js'
 import scroll from './components/s-pull-scroll/index.vue'
+import uniPopup from "./components/uni-popup/uni-popup.vue"
 Vue.prototype.date= date
 Vue.config.productionTip = false
 Vue.prototype.http=http
 App.mpType = 'app'
 Vue.component('scroll',scroll)
+Vue.component('uniPopup',uniPopup)
 const app = new Vue({
     ...App
 })

pages.json

@@ -204,7 +204,8 @@
 				"navigationStyle": "custom",
 				"app-plus": {
 					"titleNView": false
-				}
+				},
+				"enablePullDownRefresh":true
 
 			}
 		},

pages/authentication/selectHouse.vue

@@ -11,17 +11,22 @@
 				选择小区住处
 			</view>
 			<view class="dec">获取详细的小区住处，登记您的信息</view>
-			<view class="item" @tap="pickerHouse">
+			<picker mode="selector" @change="pickerHouse" :value="index" :range="houseData" range-key="comtyName"  class="item">
+			<view class="item" style="margin-top: 0;">
 				<view style="width: 26rpx;height: 26rpx;margin:28rpx 8rpx 32rpx 20rpx;">
 					<image src="../../static/select_icon_village@2x.png" style="width: 100%;height: 100%;"></image>
 				</view>
 				<input class="uni-input item-input" style="width:290rpx;height:40rpx;margin-top: 26rpx;" placeholder-class="holder"
 				 v-model="form.houseName" disabled="true" placeholder="请选择小区名称" />
+				 	 <!-- <view  style="width:290rpx;height:40rpx;margin-top: 26rpx;">{{form.houseName}}</view> -->
 				<view class="selectIcon">
 					<image src="../../static/select_combo@2x.png" style="width: 100%;height: 100%;"></image>
 				</view>
 			</view>
-			<view class="item" style="margin-top:50rpx;" @tap="pickerLou">
+			</picker>
+			<!-- 楼号 -->
+			<picker mode="selector" :range="louData" range-key="name" @change="pickerLou" class="item">
+			<view class="item" style="margin-top:0rpx;" >
 				<view style="width: 26rpx;height: 26rpx;margin:28rpx 8rpx 32rpx 20rpx;">
 					<image src="../../static/select_icon_storey@2x.png" style="width: 100%;height: 100%;"></image>
 				</view>
@@ -31,7 +36,10 @@
 					<image src="../../static/select_combo@2x.png" style="width: 100%;height: 100%;"></image>
 				</view>
 			</view>
-			<view class="item" style="margin-top:50rpx;" @tap="pickerHood">
+			</picker>
+			<!-- 单元号 -->
+			<picker mode="selector" :range="hoodData" @change="pickerHood" range-key="name" class="item">
+			<view class="item" style="margin-top:0rpx;" >
 				<view style="width: 26rpx;height: 26rpx;margin:28rpx 8rpx 32rpx 20rpx;">
 					<image src="../../static/select_icon_unit@2x.png" style="width: 100%;height: 100%;"></image>
 				</view>
@@ -41,7 +49,10 @@
 					<image src="../../static/select_combo@2x.png" style="width: 100%;height: 100%;"></image>
 				</view>
 			</view>
-			<view class="item" style="margin-top:50rpx;" @tap="pickerCeng">
+			</picker>
+			<!-- 楼层 -->
+			<picker mode="selector" :range="cengData" @change="pickerCeng" range-key="name" class="item">
+			<view class="item" style="margin-top:0rpx;">
 				<view style="width: 26rpx;height: 26rpx;margin:28rpx 8rpx 32rpx 20rpx;">
 					<image src="../../static/ceng.png" style="width: 100%;height: 100%;"></image>
 				</view>
@@ -51,7 +62,10 @@
 					<image src="../../static/select_combo@2x.png" style="width: 100%;height: 100%;"></image>
 				</view>
 			</view>
-			<view class="item" style="margin-top:50rpx;" @tap="pickerHome">
+			</picker>
+			<!-- 房屋号 -->
+			<picker mode="selector" :range="homeData" @change="pickerHome" class="item" range-key="name">
+			<view class="item" style="margin-top:0rpx;">
 				<view style="width: 26rpx;height: 26rpx;margin:28rpx 8rpx 32rpx 20rpx;">
 					<image src="../../static/homeNum.png" style="width: 100%;height: 100%;"></image>
 				</view>
@@ -61,31 +75,25 @@
 					<image src="../../static/select_combo@2x.png" style="width: 100%;height: 100%;"></image>
 				</view>
 			</view>
+			</picker>
 			<view class="bottom"></view>
 		</view>
 		<!-- 发表按钮 -->
 		<button class="btn" @tap="submit" :class="{active:form.houseName&&form.lou&&form.hoodNum&&form.home}" >发表</button>
-		<!-- 选择小区名称组件 -->
-		<lb-picker ref="houseName" :props="typeProps" :list="houseData" @confirm="confirm"></lb-picker>
-		<!-- 选择楼层组件 -->
-		<lb-picker ref="Lou" :list="louData" :props="selectProps" @confirm="confirmLou">></lb-picker>
-		<!-- 选择单元号组件 -->
-		<lb-picker ref="hoodNum" :list="hoodData" :props="selectProps" @confirm="confirmHoodNum"></lb-picker>
-		<!-- 选择楼层组件 -->
-		<lb-picker ref="ceng" :list="cengData" :props="selectProps" @confirm="confirmCeng"></lb-picker>
-		<!-- 选择房屋号组件 -->
-		<lb-picker ref="home" :list="homeData" :props="selectProps" @confirm="confirmHome"></lb-picker>
+		
 	</view>
 </template>
 
 <script>
-	import LbPicker from '@/components/lb-picker'
+	
 	export default {
 		data() {
 			return {
+				index:0,
 				isLoading: false, //按钮加载
 				cityName: '',
 				phoneHeight: 0, //手机状态栏的高度
+				name:'',//小区id
 				lou: '', //楼层
 				hoodNum: '', //单元号
 				home: '', //房屋号
@@ -159,41 +167,21 @@
 				})
 			},
 			// 选择楼层
-			pickerCeng() {
-				this.$refs.ceng.show()
-			},
-			// 选择房屋号
-			pickerHome() {
-				this.$refs.home.show()
-			},
-			//选择小区事件
-			pickerHouse() {
-				this.$refs.houseName.show()
-			},
-			// 选择楼层事件
-			pickerLou() {
-				this.$refs.Lou.show()
-			},
-			// 选择单元号事件
-			pickerHood() {
-				this.$refs.hoodNum.show()
-			},
-			// 楼层选择确定
-			confirmCeng(data) {
+			pickerCeng(e) {
 				this.form.home=''
 				this.home=''
-				this.form.ceng = data.item.name
-				this.ceng = data.item.id
+				this.form.ceng=this.cengData[e.target.value].name
+				this.ceng=this.cengData[e.target.value].id
 				this.getLouData(this.name,4,this.ceng,'门牌')
-				
 			},
-			// 房屋号选择确定
-			confirmHome(data) {
-				this.form.home = data.item.name
-				this.home = data.item.id
+			// 选择房屋号
+			pickerHome(e) {
+				this.form.home=this.homeData[e.target.value].name
+				this.home =this.homeData[e.target.value].id
+				console.log(this.home)
 			},
-			//小区选择确定
-			confirm(data) {
+			//选择小区事件
+			pickerHouse(e) {
 				this.form.lou = ''
 				this.form.hoodNum = ''
 				this.form.home = ''
@@ -202,35 +190,33 @@
 				this.ceng=''
 				this.hoodNum = '',
 					this.home = ''
-				this.form.houseName = data.item.comtyName
-				this.name = data.item.comtyId
+				this.index=Number(e.target.value)
+				this.form.houseName=this.houseData[this.index].comtyName
+				this.name=this.houseData[this.index].comtyId
 				uni.setStorageSync('comtyId', this.name)
 				this.getLouData(this.name, 1, '', 'lou')
 			},
-			//楼层选择确定
-			confirmLou(data) {
+			// 选择楼层事件
+			pickerLou(e) {
 				this.form.hoodNum = '' //单元号
 				this.form.home = ''
 				this.hoodNum = '',
 				this.home = ''
 				this.form.ceng=''
 				this.ceng=''
-				this.form.lou = data.item.name
-				this.lou = data.item.id
+				this.form.lou=this.louData[e.target.value].name
+				this.lou=this.louData[e.target.value].id
 				this.getLouData(this.name, 2, this.lou, '单元')
 			},
-			//单元号选择确定
-			confirmHoodNum(data) {
+			// 选择单元号事件
+			pickerHood(e) {
 				this.form.home = ''
 				this.home = ''
 				this.form.ceng=''
 				this.ceng=''
-				
-				this.form.hoodNum = data.item.name
-				console.log(data)
-				this.hoodNum = data.item.id
+				this.form.hoodNum=this.hoodData[e.target.value].name
+				this.hoodNum=this.hoodData[e.target.value].id
 				this.getLouData(this.name, 3,this.hoodNum , '层')
-				
 			},
 			// 发表
 			submit() {
@@ -257,7 +243,7 @@
 							 	})
 							 } else { 
 							 	uni.switchTab({
-							 	url: '../mine/mine'	
+							 	url: '../index/index'	
 							 	})
 							 }
 							 uni.hideLoading()
@@ -278,7 +264,7 @@
 			}
 		},
 		components: {
-			LbPicker
+			
 		}
 	}
 </script>

pages/circle/circles.vue

@@ -23,17 +23,16 @@
 					<!-- 发布内容 -->
 					<view class="right">
 						<view class="name">{{item.createBy}}</view>
-						<view class="text">
+						<view class="text" v-show="item.content">
 							{{item.content}}
 						</view>
 						<!-- 图片内容 -->
-						<view class="img" v-if="item.photosUrlList.length==1" v-show="item.photosUrlList.length>0"  @tap="prewImg(item)">
-							<image :src="img" style="width: 246rpx;height: 420rpx;" v-for="(img,index) in item.photosUrlList" :key="index"
-							></image>
-						</view>
-						<view class="img"  v-else style="display: flex;flex-wrap: wrap;" v-show="item.photosUrlList.length>0" @tap="prewImg(item)">
-							<image :src="img" style="width:180rpx;height:180rpx;margin-right: 10rpx;margin-bottom: 10rpx;" v-for="(img,index) in item.photosUrlList"
-							 :key="index" ></image>
+						<!-- <view class="img" v-if="item.photosUrlList.length==1" v-show="item.photosUrlList.length>0" >
+							<image :src="img" style="width: 246rpx;height: 420rpx;" v-for="(img,index2) in item.photosUrlList" :key="index2" mode="aspectFill"  @tap="previewImage(item.photosUrlList,index2)"></image>
+						</view> -->
+						<view class="img"  style="display: flex;flex-wrap: wrap;" v-show="item.photosUrlList.length>0" >
+							<image :src="img"  @tap="previewImage(item.photosUrlList,index2)" mode="aspectFill" style="width:180rpx;height:180rpx;margin-right: 10rpx;margin-bottom: 10rpx;" v-for="(img,index2) in item.photosUrlList"
+							 :key="index2"></image>
 						</view>
 						<!-- 点赞 -->
 						<view style="width: 100%;height: 42rpx;display:flex;position: relative; margin-bottom: 20rpx;">
@@ -42,6 +41,7 @@
 							</view>
 							<view style="width: 42rpx;height: 37rpx;position: absolute;right:82rpx ;" @tap="clickZan(item)">
 								<image src="../../static/circle_icon_heart_set@2x.png" style="width: 100%;height: 100%;"></image>
+								<!-- <image src="../../static/dzed.png" style="width: 100%;height: 100%;" v-else-if="item.likenumInt>=1"></image> -->
 							</view>
 							<!-- 评论 -->
 							<view class="meau" @tap="talk(item.circleId)">
@@ -49,7 +49,7 @@
 							</view>
 						</view>
 						<!-- 评论列表 -->
-						<view class="list" v-show="item.commentsList.length>0">
+						<view class="list" v-if="item.commentsList.length>0">
 							<view class="replayContent">
 								<view style="margin-left: 16rpx;margin-top: 10rpx;" v-for="(list,index) in item.commentsList" :key="index">
 									<view class="talk">
@@ -76,11 +76,21 @@
 		<view class="talkAbout" v-show="isTalk">
 			<!-- 评论弹出框-->
 			<view class="leftContent">
-				<input type="text" style="width: 100%;height: 100%;padding-left: 16rpx;" placeholder="评论"  @confirm="send" :focus="isFouce" @blur="bindBlur"
-				 v-model="talkInfo">
+				<input type="text" style="width: 100%;height: 100%;padding-left: 16rpx;" placeholder="评论" cursor-spacing="2"
+				 @confirm="send" :focus="isFouce" @blur="bindBlur" v-model="talkInfo">
 			</view>
 			<view @tap="send" class="sendBtn">发送</view>
 		</view>
+		<!-- 认证房屋是否通过提示 -->
+		<uniPopup ref='popup' type="center">
+			<view style="width: 600rpx;height: 522rpx;background-color: #fff;border-radius: 10rpx;" class="popupBox">
+				<image src="../../static/auditing_popup.png" style="width:85%;height: 100%;margin-top: -50rpx;margin-left: 30rpx;"></image>
+				<view class="popupTitle" v-if="houseStatus==1">当前认证房屋正在审核中</view>
+				<view class="popupTitle" v-else-if="houseStatus==4">当前暂无房屋绑定,请重新认证</view>
+				<button class="popupBtn" @tap="popupClose" v-if="houseStatus==1">我知道了</button>
+				<button class="popupBtn" @tap="goTapHouse" v-else-if="houseStatus==4">去认证</button>
+			</view>
+		</uniPopup>
 	</view>
 </template>
 <script>
@@ -89,9 +99,10 @@
 	export default {
 		data() {
 			return {
-				userName:uni.getStorageSync('userName'),
-				headImg:uni.getStorageSync('headImg'),
-				userPhone:uni.getStorageSync('userPhone'),
+				houseStatus: '',
+				userName: uni.getStorageSync('userName'),
+				headImg: uni.getStorageSync('headImg'),
+				userPhone: uni.getStorageSync('userPhone'),
 				circleId: '', //朋友圈Id
 				isUpFinish: false,
 				// 上拉加载时文案
@@ -115,7 +126,22 @@
 				]
 			}
 		},
+		onTabItemTap() {
+			_self = this;
+			page = 1
+			this.getData()
+			
+		},
 		onShow() {
+			this.houseStatus = uni.getStorageSync('houseStatus')
+		},
+		onPullDownRefresh() {
+			uni.showLoading({
+				title: '加载中',
+				mask: true
+			})
+			_self = this;
+			page = 1
 			this.getData()
 		},
 		onReachBottom() {
@@ -129,23 +155,39 @@
 			this.phoneHeight = uni.getSystemInfoSync().statusBarHeight
 		},
 		onLoad() {
+			uni.showLoading({
+				title: '加载中',
+				mask: true
+			})
 			_self = this;
+			page = 1
 			this.getData()
+			this.houseStatus = uni.getStorageSync('houseStatus')
 		},
-
 		methods: {
+			//重新认证房屋
+			goTapHouse(){
+				uni.navigateTo({
+					url:'../authentication/city'
+				})
+				this.$refs.popup.close()
+			},
+			// 关闭弹窗
+			popupClose() {
+				this.$refs.popup.close()
+			},
 			//查看我的信息
-			seeMyInfo(){
+			seeMyInfo() {
+				if (this.houseStatus == 1||this.houseStatus==4) {
+					this.$refs.popup.open()
+					return
+				}
 				uni.navigateTo({
-					url:'../mine/myInfo'
+					url: '../mine/myInfo'
 				})
 			},
 			//获取列表数据
 			getData() {
-				uni.showLoading({
-					title: '加载中',
-					mask: true
-				})
 				this.http.httpRequest('/wxapplet/prop/comtycircle/list', 'get', {
 					pageNum: page,
 					comtyId: uni.getStorageSync('comtyId'),
@@ -154,7 +196,10 @@
 					console.log(res)
 					if (res.code == 0) {
 						this.data = res.data.rows
-						uni.hideLoading()
+						setTimeout(() => {
+							uni.hideLoading()
+							uni.stopPullDownRefresh()
+						}, 1500)
 					} else {
 						uni.hideLoading()
 						uni.showToast({
@@ -163,7 +208,7 @@
 						})
 					}
 				}).catch(() => {
-
+					uni.hideLoading()
 				})
 			},
 			//加载更多数据获取
@@ -177,16 +222,15 @@
 					console.log(res)
 					if (res.code == 0) {
 						// 判断当前数据是否加载完毕
-						if (this.data.length >= 3) {
+						if (this.data.length >= res.data.total) {
 							this.isUpLoading = false
 							this.isUpFinish = true
 							return
 						} else {
-
 							this.isUpFinish = false
 							setTimeout(() => {
 								page++; //每加载一次 页数+1
-								_self.data = _self.data.concat(_self.list); //将数据拼接在一起
+								this.data = this.data.concat(res.data.rows); //将数据拼接在一起
 								this.isUpLoading = false
 							}, 500)
 						}
@@ -202,15 +246,16 @@
 
 			},
 			// 预览图片
-			prewImg(item, index) {
-				console.log(item)
-				 uni.previewImage({
-				  // current:item.imgArr[index],
-				 	urls:item.photosUrlList,
-				success:(res)=>{
-
-				}
-				 })
+			previewImage(item,index) {
+				uni.previewImage({
+					current:item[index],
+					urls: item,
+					success: (res) => {
+						console.log(res)
+						uni.stopPullDownRefresh()
+						// uni.hideLoading()
+					}
+				})
 			},
 			// 切换背景图片
 			changeBgImg() {
@@ -235,8 +280,10 @@
 			},
 			// 发送评论
 			send() {
+				let talkInfo = this.talkInfo
+				console.log(talkInfo)
 				//判断评论是否为空
-				if(!this.talkInfo){
+				if (!this.talkInfo) {
 					return
 				}
 				this.http.httpRequest('/wxapplet/prop/comment/add', 'post', {
@@ -245,14 +292,19 @@
 					createBy: uni.getStorageSync('createBy')
 				}, true).then((res) => {
 					if (res.code == 0) {
-						// setTimeout(() => {
-						// 	this.getData()
-						// }, 1500)
-						
-						if (getCurrentPages().length != 0) {
-						            //刷新当前页面的数据
-						            getCurrentPages()[getCurrentPages().length - 1].onLoad()
-						          }
+						this.data.forEach((item, index) => {
+							// 判断当前评论的时哪条信息
+							if (item.circleId == this.circleId) {
+								this.data[index].commentsList.push({
+									commentConten: talkInfo,
+									comCreateBy: uni.getStorageSync('createBy')
+								})
+								// temp.commentConten = talkInfo,
+								// 	temp.comCreateBy = uni.getStorageSync('createBy')
+								// item.commentsList.push(temp)
+							}
+						})
+						console.log(this.data)
 					} else {
 						uni.showToast({
 							title: res.msg,
@@ -266,6 +318,10 @@
 			},
 			// 评论
 			talk(id) {
+				if (this.houseStatus == 1||this.houseStatus==4) {
+					this.$refs.popup.open()
+					return
+				}
 				this.circleId = id
 				this.visible = false
 				this.isTalk = true
@@ -280,19 +336,29 @@
 			},
 			//点赞
 			clickZan(item) {
+				if (this.houseStatus == 1||this.houseStatus==4) {
+					this.$refs.popup.open()
+					return
+				}
 				this.http.httpRequest('/wxapplet/prop/comtycircle/edit', 'post', {
 					pLikeUserId: item.userId,
 					circleId: item.circleId
 				}, true).then((res) => {
 					console.log(res)
 					if (res.code == 0) {
-						uni.showToast({
-							title: '点赞成功',
-							'icon': 'success'
+						// uni.showToast({
+						// 	title: '点赞成功',
+						// 	'icon': 'success'
+						// })
+						// setTimeout(() => {
+						// 	this.getData()
+						// }, 500)
+						this.data.forEach((ele) => {
+							// 判断当前评论的时哪条信息
+							if (ele.circleId == item.circleId) {
+								ele.likenumInt = 1
+							}
 						})
-						setTimeout(() => {
-							this.getData()
-						}, 500)
 					} else {
 						uni.showToast({
 							title: res.msg,
@@ -309,6 +375,10 @@
 			},
 			// 发布
 			publish() {
+				if (this.houseStatus == 1||this.houseStatus==4) {
+					this.$refs.popup.open()
+					return
+				}
 				uni.navigateTo({
 					url: "publish"
 				})
@@ -319,6 +389,45 @@
 </script>
 
 <style lang="scss">
+	.popupClose {
+		width: 44rpx;
+		height: 44rpx;
+		position: absolute;
+		right: 20rpx;
+		top: 20rpx;
+
+	}
+
+	.popupBtn {
+		width: 342rpx;
+		height: 80rpx;
+		position: absolute;
+		bottom: 80rpx;
+		left: 128rpx;
+		background: rgba(41, 138, 253, 1);
+		color: #FFFFFF;
+		font-size: 32rpx;
+	}
+
+	.popupTitle {
+		width: 400rpx;
+		height: 40rpx;
+		font-size: 28rpx;
+		color: #999999;
+		position: absolute;
+		bottom: 232rpx;
+		left: 170rpx;
+	}
+
+	.popupImage {
+		width: 100%;
+		height: 300rpx;
+		/* 	background-image: url(../../static/success_popup@2x.png);
+	 position: absolute;
+	 top: -64rpx; */
+
+	}
+
 	.zanNumber {
 		position: absolute;
 		right: 135rpx;
@@ -344,13 +453,13 @@
 
 	.talkAbout {
 		width: 100%;
-		height: 120rpx;
+		height: 130rpx;
 		display: flex;
 		position: fixed;
 		bottom: 20rpx;
 		background: rgba(247, 247, 247, 1);
 		border-top: 1rpx solid #C0C0C0;
-		margin-left: 10rpx;
+		// margin-left: 10rpx;
 	}
 
 	.leftContent {

pages/circle/publish.vue

@@ -3,20 +3,22 @@
 	<view class="">
 		<view class="content">
 			<view class="text">
-				<textarea style="width: 100%;" :auto-height="true" placeholder="这一刻的想法" v-model="textarea"></textarea>
+				<textarea style="width: 100%;" :auto-height="true" placeholder="这一刻的想法" v-model="textarea" maxlength="300"></textarea>
 			</view>
 			<view class="imgBox">
 				<view class="upImg" >
-					<image :src="item" v-for="(item,index) in imgData" :key="index" @longtap="deleteImg(index)" style="width:208rpx;height: 208rpx;margin-right: 10rpx;margin-bottom: 10rpx;"
+					<image :src="item" v-for="(item,index) in imgData" :key="index" @longpress="deleteImg(index)" @tap="prew(imgData,index)"  style="width:208rpx;height: 208rpx;margin-right: 10rpx;margin-bottom: 10rpx;"
 					 v-show="imgData.length>0" ></image>
-					<image src="../../static/circle_image@2x.png" style="width:208rpx;height: 208rpx;margin-bottom: 10rpx;" @tap="chooseImg"></image>
+					<image src="../../static/circle_image@2x.png" style="width:208rpx;height: 208rpx;margin-bottom: 10rpx;" @tap="chooseImg" v-if="imgData.length<9"></image>
+					<!-- <view style="font-size: 18rpx;line-height:114rpx;color: #999999;margin-left: 10rpx;" v-if="imgData.length>0">长按图片可以进行删除</view> -->
 				</view>
 				<!-- <view style="width: 208rpx;height: 208rpx;" @tap="chooseImg">
 					<image src="../../static/circle_image@2x.png" style="width: 100%;height: 100%;"></image>
 				</view> -->
 			</view>
 		</view>
-		<view class="btn" :class="{active:textarea}" @tap="push">发表</view>
+		<view v-if="imgData.length>0 || textarea" @tap="push" class="btn active">发表</view>
+		<view v-else @tap="push" class="btn">发表</view>
 	</view>
 </template>
 
@@ -26,9 +28,25 @@
 			return {
 				imgData: [], //图片数据
 				textarea: '', //文本数据
+				num:9
 			}
 		},
+		
 		methods: {
+		// 计算还能选择几张
+		  formatNum(){
+			this.num=9-this.imgData.length  
+		  },
+			// 预览图片
+			prew(item,index){
+				uni.previewImage({
+				  current:item[index],
+				 	urls:item,
+				success:(res)=>{
+				
+				},
+				})
+			},
 			// 长按图片删除
 			deleteImg(index){
 				 wx.showModal({
@@ -37,6 +55,7 @@
 				   success:  (res) =>{
 				    if (res.confirm) {
 				     this.imgData.splice(index, 1);
+					 this.formatNum()
 				    } else if (res.cancel) {
 				      return false;    
 				     }
@@ -45,7 +64,7 @@
 			},
 			// 发表
 			push() {
-				if (this.textarea) {
+				if (this.textarea || this.imgData.length>0) {
 					let img = ''
 					// 判断是否上传图片
 					if (this.imgData.length > 0) {
@@ -71,9 +90,11 @@
 								'icon':'success',
 								title:'发表成功'
 							})
+							this.textarea=''
+							this.imgData=[]
 							setTimeout(()=>{
 								uni.switchTab({
-										url:'./circles'
+								url:'./circles'
 								})
 							},800)
 								
@@ -94,7 +115,7 @@
 			// 添加照片
 			chooseImg() {
 				// 判断当前选择图片是否大于九张
-				if (this.imgData.length == 9) {
+				if (this.imgData.length >= 9) {
 					uni.showToast({
 						"icon": 'none',
 						title: '最多只能上传九张图片'
@@ -102,7 +123,7 @@
 					return
 				}
 				uni.chooseImage({
-					count: 9, //默认9
+					count: this.num, //默认9
 					sizeType: ['original', 'compressed'], //可以指定是原图还是压缩图，默认二者都有
 					// sourceType: ['album'], //从相册选择
 					success: (res) => {
@@ -111,11 +132,15 @@
 						var length = res.tempFilePaths.length; //总共个数
 						var i = 0; //第几个
 						this.uploadDIY(res.tempFilePaths, successUp, failUp, i, length);
-						}
+					}
 				});
 			},
 			// 上传图片
 			uploadDIY(filePaths, successUp, failUp, i, length) {
+				uni.showLoading({
+					mask:true,
+					title:'上传中'
+				})
 				wx.uploadFile({
 					filePath: filePaths[i],
 					url: 'https://www.szdeao.com/wxapplet/upload/imgPhoto ', //仅为示例，非真实的接口地址
@@ -123,14 +148,31 @@
 					method: 'post',
 					success: (resp) => {
 						let data =JSON.parse(resp.data)
+						if(data.code==0){
+							let reg=/,$/gi;
+							  let str=data.data.imagesPath.replace(reg,"");
+							  if(this.imgData.length<9){
+								  this.imgData.push(str)
+								  this.formatNum()
+								  uni.hideLoading()
+								  setTimeout(()=>{
+									  uni.showToast({
+									  	title:'上传成功',
+										'icon':'success'
+									  })
+								  },1000)
+							  }
+							successUp++;
+						}else{
+							uni.showToast({
+								title:'上传失败,'+data.msg,
+								'icon':'none'
+							})
+						}
 						console.log(data)
-						 let reg=/,$/gi;
-						  let str=data.data.imagesPath.replace(reg,"");
-						  this.imgData.push(str)
-						  console.log(this.imgData)
-						successUp++;
 					},
 					fail: (res) => {
+						console.log(res)
 						failUp++;
 					},
 					complete: () => {
@@ -194,7 +236,7 @@
 	}
 
 	.active {
-		color: rgba(255, 255, 255, 1);
-		background: rgba(41, 138, 253, 1);
+		color: rgba(255, 255, 255, 1) !important;
+		background: rgba(41, 138, 253, 1) !important;
 	}
 </style>

pages/complain/evaluateCompalin.vue

@@ -25,7 +25,7 @@
 					评价内容
 				</view>
 				<view class="textContent">
-					<textarea placeholder="请填写评价" style="width: 95%;height: 96%;margin-left: 10rpx;margin-top: 10rpx;" v-model="textRea"></textarea>
+					<textarea placeholder="请填写评价" style="width: 95%;height: 96%;margin-left: 10rpx;margin-top: 10rpx;" v-model="textRea" cursor-spacing="120" maxlength="300"></textarea>
 				</view>
 				<!-- 图片盒字 -->
 				<!-- <view style="width:646rpx;height: 114rpx;position: absolute;left: 24rpx;bottom: 40rpx;display: flex;">
@@ -84,6 +84,8 @@
 				   	// 判断请求是否成功 0 成功 
 				   	if (res.code == 0) {
 				   		uni.setStorageSync('rateType',0)
+						this.textRea=''
+						this.starNum=0
 				   		uni.navigateTo({
 				   			url:"../onlineRpair/evalueSuccess"
 				   		})

pages/complain/index.vue

@@ -14,12 +14,12 @@
 					<view class="text">
 						{{item.content}}
 					</view>
-					<view class="img" v-show="item.photosUrlList.length>0" @tap="prew(item)">
-						<image :src="img" style="width: 180rpx;height: 180rpx;padding-right: 10rpx;margin-bottom: 10rpx;" v-for="(img,index) in item.photosUrlList"
-						 :key="index"></image>
+					<view class="img" v-show="item.photosUrlList.length>0" >
+						<image :src="img" style="width: 180rpx;height: 180rpx;padding-right: 10rpx;margin-bottom: 10rpx;"@tap="prew(item.photosUrlList,index1)" v-for="(img,index1) in item.photosUrlList"
+						 :key="index1"></image>
 					</view>
 					<!-- 我要评论 -->
-					<view class="bottomBtn" @tap="myTalk(item.adviceId)">我的评价</view>
+					<view class="bottomBtn" @tap="myTalk(item.adviceId)" v-show="item.userId==userId &&item.state==2 ">我的评价</view>
 					<view class="date">{{(item.createTime).substr(0,16)}}</view>
 				</view>
 			</view>
@@ -35,6 +35,7 @@
 	export default {
 		data() {
 			return {
+				userId:uni.getStorageSync('userId'),
 				data: [],
 				total: 0, //总条数
 				pageNum: 1, //页数
@@ -44,12 +45,17 @@
 		onLoad() {
 			this.refresh();
 		},
+		onUnload() {
+			uni.switchTab({
+				url:'../index/index'
+			})
+		},
 		methods: {
 			// 预览图片
-			prew(item){
+			prew(item,index){
 				uni.previewImage({
-				  // current:item.imgArr[index],
-				 	urls:item.photosUrlList,
+				  current:item[index],
+				 	urls:item,
 				success:(res)=>{
 				
 				},

pages/complain/wantCompalin.vue

@@ -17,21 +17,22 @@
 				<image src="../../static/guarantee_icon_summary@2x.png" class="mainImg"></image>
 				<view class="fa">投诉摘要</view>
 				<view class="star">
-				   <input placeholder="请填写投诉摘要" style="width: 95%;height: 100%;margin: 0 auto;" v-model="digest"/>
+				   <input placeholder="请填写投诉摘要" style="width: 95%;height: 100%;margin: 0 auto;" maxlength="69" v-model="digest"/>
 				</view>
 				<image src="../../static/guarantee_icon_content@2x.png" class="contentImg"></image>
 				<view class="contentTitle">
 					投诉内容
 				</view>
 				<view class="textContent">
-					<textarea placeholder="请填写投诉内容" style="width: 95%;height: 96%;margin-left: 10rpx;margin-top: 10rpx;" v-model="textRea"></textarea>
+					<textarea placeholder="请填写投诉内容" style="width: 95%;height: 96%;margin-left: 10rpx;margin-top: 10rpx;" v-model="textRea" maxlength="300" cursor-spacing="120"></textarea>
 				</view>
 				<!-- 图片盒字 -->
 				<view style="width:646rpx;height: 114rpx;position: absolute;left: 24rpx;bottom: 40rpx;display: flex;">
 					<view style="height: 114rpx;margin-right: 10rpx;display: flex;justify-content: space-between;" v-show="imgData" >
-						<image style="width: 114rpx;height: 114rpx;margin-right: 10rpx;" :src="item" v-for="(item,index) in imgData" :key="index" @longtap="deleteImg(index)" @tap="prew(imgData)"></image>
+						<image style="width: 114rpx;height: 114rpx;margin-right: 10rpx;" :src="item" v-for="(item,index) in imgData" :key="index" @longpress="deleteImg(index)" @tap="prew(imgData,index)"></image>
 					</view>
-					<image src="../../static/circle_image@2x.png" style="width: 114rpx;height: 114rpx;" @tap="uploadImg(item)"></image>
+					<image src="../../static/circle_image@2x.png" style="width: 114rpx;height: 114rpx;" @tap="uploadImg(item)" v-if="imgData.length<3"></image>
+					<view style="font-size: 18rpx;line-height:114rpx;color: #999999;margin-left: 10rpx;" v-if="imgData.length>0">长按图片可以进行删除</view>
 				</view>
 			</view>
 		</view>
@@ -48,7 +49,8 @@
 				starNum:0,//星星数量
 				phoneHeight: 0, //手机状态栏的高度
 				isShow: false,
-				imgData: []
+				imgData: [],
+				num:3
 			}
 		},
 		 components: {},
@@ -57,10 +59,14 @@
 			this.phoneHeight = uni.getSystemInfoSync().statusBarHeight
 		},
 		methods: {
+			// 计算还能选择几张
+			  formatNum(){
+				this.num=3-this.imgData.length  
+			  },
 			// 预览图片
-			prew(item){
+			prew(item,index){
 				uni.previewImage({
-				  // current:item.imgArr[index],
+				  current:item[index],
 				 	urls:item,
 				success:(res)=>{
 				
@@ -75,6 +81,7 @@
 				   success:  (res) =>{
 				    if (res.confirm) {
 				     this.imgData.splice(index, 1);
+					 this.formatNum()
 				    } else if (res.cancel) {
 				      return false;    
 				     }
@@ -87,7 +94,7 @@
 		},
 			// 图片上传
 			uploadImg(item) {
-				if (this.imgData.length == 3) {
+				if (this.imgData.length >= 3) {
 					uni.showToast({
 						"icon": 'none',
 						title: "最多可以上传三张图片"
@@ -95,7 +102,7 @@
 					return
 				} else {
 					uni.chooseImage({
-						count: 3, //默认9
+						count: this.num, //默认9
 						sizeType: ['original', 'compressed'], //可以指定是原图还是压缩图，默认二者都有
 						// sourceType: ['album'], //从相册选择
 						success: (res) => {
@@ -111,6 +118,10 @@
 			},
 			// 上传图片
 			uploadDIY(filePaths, successUp, failUp, i, length) {
+				uni.showLoading({
+					mask:true,
+					title:'上传中'
+				})
 				wx.uploadFile({
 					filePath: filePaths[i],
 					url: 'https://www.szdeao.com/wxapplet/upload/imgPhoto ', //仅为示例，非真实的接口地址
@@ -119,11 +130,28 @@
 					success: (resp) => {
 						let data =JSON.parse(resp.data)
 						console.log(data)
-						 let reg=/,$/gi;
-						  let str=data.data.imagesPath.replace(reg,"");
-						  this.imgData.push(str)
-						  console.log(this.imgData)
-						successUp++;
+						// 判断上传照片是否成功
+						if(data.code==0){
+							let reg=/,$/gi;
+							  let str=data.data.imagesPath.replace(reg,"");
+							  if(this.imgData.length<3){
+								  this.imgData.push(str)
+								  this.formatNum()
+								  uni.hideLoading()
+								  setTimeout(()=>{
+									  uni.showToast({
+									  	title:'上传成功',
+										'icon':'success'
+									  })
+								  },1000)
+							  }
+							successUp++;
+						}else{
+							uni.showToast({
+								title:'上传失败,'+data.msg,
+								'icon':'none'
+							})
+						} 
 					},
 					fail: (res) => {
 						failUp++;
@@ -162,6 +190,9 @@
 							uni.navigateTo({
 								url:'./compalinSuccess'
 							})
+							this.textRea=''
+							this.digest=''
+							this.imgData=[]
 							uni.hideLoading()
 						}else{
 							uni.hideLoading()

pages/family/family.vue

@@ -7,14 +7,13 @@
 			<view class="topNum">今天有<text style="font-weight:400;">0</text>条出行异常</view>
 		</view>
 		<!-- <view style="margin-top: 30rpx;"> -->
-		<view v-show="visible">
+		<view >
 			<!-- <view class="img">
 				<image src="../../static/null_image_checking@2x.png" style="width: 100%;height: 100%;"></image>
 			</view> -->
-			<view>
-			<view class="title">
-				暂无数据
-			</view>
+			<view style="width:520rpx;margin: 0 auto;margin-top: 30rpx;" v-show="visible">
+				<image src="../../static/notData.png" style="width:520rpx ;height: 520rpx;"></image>
+				<view style="width:144rpx;height:50rpx;font-size:36rpx;margin: 0 auto;margin-top: 46rpx;">暂无数据</view>
 			</view>
 		<view class="content" v-for="(item,index) in data" :key="index" v-show="!visible">
 			<view class="item">

pages/index/changeHouse.vue

@@ -1,7 +1,16 @@
 <!-- 切换房屋 -->
 <template>
 	<view class="">
-		<view class="item" v-for="(item,index) in data" :key="index">
+		<view v-show="visible">
+			<view class="img">
+				<image src="../../static/null_image_checking@2x.png" style="width: 100%;height: 100%;"></image>
+			</view>
+			<view class="title">
+				暂无数据~
+			</view>
+		</view>
+		<!-- 内容 -->
+		<view class="item" v-for="(item,index) in data" :key="index" v-show="!visible">
 			<view class="content">
 				<view class="city">
 					<view style="height: 100%;display: flex;">
@@ -15,7 +24,7 @@
 					<view class="text">{{item.houseName}}</view>
 					<view class="delete">
 						<radio-group @change="changeHouse(item)">
-							<radio style="transform:scale(0.8)" :value="item.houseName" :checked="address==item.houseName" />
+							<radio style="transform:scale(0.8)" :value="item.houseName" :checked="homeId==item.houseId" />
 						</radio-group>
 
 					</view>
@@ -29,26 +38,37 @@
 	export default {
 		data() {
 			return {
+				visible:true,
 				data: [],
-				  address:uni.getStorageSync('homeAdress')
+				address: uni.getStorageSync('homeAdress'),
+				homeId:uni.getStorageSync('homeId')
 			}
 		},
 		onShow() {
-			
+
 		},
 		mounted() {
 			this.getHouseData()
 		},
 		methods: {
-			// 删除房屋
+			// 切换房屋
 			changeHouse(item) {
 				console.log(item)
-				uni.setStorageSync('homeAdress',item.houseName)
-				uni.setStorageSync('comtyId',item.comtyId)
-				uni.setStorageSync('homeId',item.houseId)
+				uni.setStorageSync('homeAdress', item.houseName)
+				uni.setStorageSync('comtyId', item.comtyId)
+				uni.setStorageSync('homeId', item.houseId)
+			   this.http.httpRequest('/wxapplet/ownersid/getHouseState','get',{
+			   	cardNo:uni.getStorageSync('idNumber'),
+			   	comtyId:uni.getStorageSync('comtyId'),
+			   	houseId:uni.getStorageSync('homeId'),
+			   },true).then((res)=>{
+			   	if(res.code==0){
+			   		uni.setStorageSync('houseStatus',res.data.houseStatus)
+			   	}
 				uni.switchTab({
 					url: "./index"
 				})
+			   })
 			},
 			// 添加房屋信息
 			addMyHouse() {
@@ -67,6 +87,11 @@
 				}, true).then((res) => {
 					console.log(res)
 					if (res.code == 0) {
+						if(res.data.length==0){
+							this.visible=true
+						}else{
+							this.visible=false
+						}
 						uni.hideLoading()
 						this.data = res.data
 					} else {
@@ -76,7 +101,7 @@
 							"icon": 'none'
 						})
 					}
-				}).catch(()=>{
+				}).catch(() => {
 					uni.hideLoading()
 				})
 			}
@@ -84,7 +109,25 @@
 	}
 </script>
 
-<style>
+<style> 
+	.img{
+		width: 520rpx;
+		height: 520rpx;
+		margin: 0  auto;
+		margin-top: 262rpx;
+	}
+	.title{
+		width: 510rpx;
+		height: 50rpx;
+		font-size:36rpx;
+		font-family:PingFang SC;
+		font-weight:400;
+		line-height:50rpx;
+		color:rgba(36,36,36,1);
+		margin:0 auto;
+		margin-top: 46rpx;
+		text-align: center;
+		}
 	.btn {
 		width: 702rpx;
 		height: 90rpx;

pages/index/index.vue

@@ -1,7 +1,8 @@
 <template>
 	<view style="background:rgba(245,245,245,1);opacity:1;">
 		<view class="topBox">
-			<image :src="photoData[swiperIndex].photo" style="width: 100%;height:391rpx;"></image>
+			<!-- <image :src="photoData[swiperIndex].photo"></image> -->
+			<view class="topBg" :style="{paddingTop:phoneHeight + 'px'}"></view>
 			<!-- 当前绑定房屋信息 -->
 			<view class="topBoxInfo">
 				<view class="topInfo" :style="{marginTop:phoneHeight + 'px'}" @tap="selectHouse">
@@ -70,7 +71,12 @@
 			</view>
 			<!-- 公告信息 -->
 			<view class="item">
-				<view class="mainInfo" v-for="(item,index) in list" :key="index" @tap="seeDetail(item.id)">
+				<!-- <view class="notInfo" v-show="visible">暂无公告信息</view> -->
+				<view style="width:300rpx;margin: 0 auto;margin-top: 10rpx;" v-show="visible">
+					<image src="../../static/notData.png" style="width:300rpx ;height: 300rpx;"></image>
+					<view style="width:144rpx;height:50rpx;font-size:36rpx;margin: 0 auto;margin-top: 10rpx;">暂无数据</view>
+				</view>
+				<view class="mainInfo" v-for="(item,index) in list" :key="index" @tap="seeDetail(item.id)" v-show="!visible">
 					<view class="left">
 						<view style="width: 100%;height: 42rpx;ont-size:30rx;font-family:PingFang SC;font-weight:bold;color:rgba(51,51,51,1);margin-top: 40rpx;">
 							{{item.title}}
@@ -78,7 +84,7 @@
 						<view class="leftInfo">{{item.content}}</view>
 						<view class="leftDate">
 							<!-- v-if="item.status==1" -->
-							<view class="leftTag" >最新</view>
+							<view class="leftTag">最新</view>
 							<view style="width:230rpx;height:34rpx;font-size:24rpx;font-family:PingFang SC;font-weight:400;line-height:34rpx;color:rgba(204,204,204,1);position: absolute;right: 0;">{{(item.createDate).substr(0,16)}}</view>
 						</view>
 					</view>
@@ -88,6 +94,16 @@
 				</view>
 			</view>
 		</view>
+		<!-- 认证房屋是否通过提示 -->
+		<uniPopup ref='popup' type="center">
+			<view style="width: 600rpx;height: 522rpx;background-color: #fff;border-radius: 10rpx;" class="popupBox">
+				<image src="../../static/auditing_popup.png" style="width:85%;height: 100%;margin-top: -50rpx;margin-left: 30rpx;"></image>
+				<view class="popupTitle" v-if="status==1">当前认证房屋正在审核中</view>
+				<view class="popupTitle" v-else-if="status==4">当前暂无房屋绑定,请重新认证</view>
+				<button class="popupBtn" @tap="popupClose" v-if="status==1">我知道了</button>
+				<button class="popupBtn" @tap="goTapHouse" v-else-if="status==4">去认证</button>
+			</view>
+		</uniPopup>
 	</view>
 </template>
 
@@ -99,8 +115,9 @@
 				swiperIndex: 0, //当前显示轮播图的索引
 				photoData: ["../../static/empower_image@2x.png", "../../static/login_bgground@2x.png"], //轮播图数据
 				list: [], //物业公告数据
-				adress: ''
-
+				adress: '',
+				visible: true,
+				status: ''
 			}
 		},
 		created() {
@@ -108,39 +125,70 @@
 			this.phoneHeight = uni.getSystemInfoSync().statusBarHeight
 			this.getBannerData()
 			this.getUserInfo()
+		
+		},
+		onLoad() {
+			this.getStatus()
+			this.status = uni.getStorageSync('houseStatus')
 		},
 		onShow() {
+			this.getStatus()
+				this.status = uni.getStorageSync('houseStatus')
 			this.adress = uni.getStorageSync('homeAdress')
 			this.getNoticeList()
 		},
 		mounted() {
-			
+
 		},
 		methods: {
+			//重新认证房屋
+			goTapHouse() {
+				uni.navigateTo({
+					url: '../authentication/city'
+				})
+				this.$refs.popup.close()
+			},
+			// 关闭弹窗
+			popupClose() {
+				this.$refs.popup.close()
+			},
+			// 获取当前房屋认证状态
+			getStatus() {
+				this.http.httpRequest('/wxapplet/ownersid/getHouseState', 'get', {
+					cardNo: uni.getStorageSync('idNumber'),
+					comtyId: uni.getStorageSync('comtyId'),
+					houseId: uni.getStorageSync('homeId'),
+				}, true).then((res) => {
+					if (res.code == 0) {
+						this.status = res.data.houseStatus
+						uni.setStorageSync('houseStatus', res.data.houseStatus)
+					}
+				})
+			},
 			//把base64转换成图片
-			 getBase64ImageUrl(data) {
-			     /// 获取到base64Data
-			     var base64Data = data;
-			     /// 通过微信小程序自带方法将base64转为二进制去除特殊符号，再转回base64
-			     base64Data = uni.arrayBufferToBase64(uni.base64ToArrayBuffer(base64Data))  
-			     /// 拼接请求头，data格式可以为image/png或者image/jpeg等，看需求
-			     const base64ImgUrl = "data:image/png;base64," + base64Data;
-			     // 刷新数据
-			 return base64ImgUrl
-			 },
+			getBase64ImageUrl(data) {
+				/// 获取到base64Data
+				var base64Data = data;
+				/// 通过微信小程序自带方法将base64转为二进制去除特殊符号，再转回base64
+				base64Data = uni.arrayBufferToBase64(uni.base64ToArrayBuffer(base64Data))
+				/// 拼接请求头，data格式可以为image/png或者image/jpeg等，看需求
+				const base64ImgUrl = "data:image/png;base64," + base64Data;
+				// 刷新数据
+				return base64ImgUrl
+			},
 			// 获取用户信息
-			getUserInfo(){
+			getUserInfo() {
 				this.http.httpRequest('/wxapplet/ownersid/getUser', 'get', {
 					userId: uni.getStorageSync('userId')
 				}, true).then((res) => {
 					if (res.code == 0) {
-						uni.setStorageSync('userName',res.data.loginName)
-						uni.setStorageSync('userPhone',res.data.phoneNum)
+						uni.setStorageSync('userName', res.data.loginName)
+						uni.setStorageSync('userPhone', res.data.phoneNum)
 						// 判断当前返回值是否是网络路径图片
-						if(res.data.avatar.indexOf('https://')==-1){
-							uni.setStorageSync('headImg',this.getBase64ImageUrl(res.data.avatar))  
-						}else{
-							uni.setStorageSync('headImg',res.data.avatar)
+						if (res.data.avatar.indexOf('https://') == -1) {
+							uni.setStorageSync('headImg', this.getBase64ImageUrl(res.data.avatar))
+						} else {
+							uni.setStorageSync('headImg', res.data.avatar)
 						}
 					} else {
 						// uni.showToast({
@@ -148,16 +196,15 @@
 						// 	'icon': 'none'
 						// })
 					}
-				
-				}).catch(() => {
-				})
+
+				}).catch(() => {})
 			},
 			// 获取轮播图数据
 			getBannerData() {
 				this.http.httpRequest('/wxapplet/owner/AdvertPhoto/list', 'get', {}, true).then((res) => {
 					console.log(res)
 					if (res.code == 0) {
-					  this.photoData=res.data.rows
+						this.photoData = res.data.rows
 					} else {
 						uni.showToast({
 							title: res.msg,
@@ -177,13 +224,16 @@
 				}, true).then((res) => {
 					console.log(res)
 					if (res.code == 0) {
-						uni.hideLoading()
 						// 判断当前数据是否大于三条数据
-						if (res.data.rows.length > 3) {
+						if (res.data.rows.length == 0) {
+							this.visible = true
+						} else if (res.data.rows.length > 3) {
 							this.list = res.data.rows.splice(0, 3)
+							this.visible = false
 						} else {
 							this.list = res.data.rows
 						}
+						uni.hideLoading()
 					} else {
 						uni.hideLoading()
 						uni.showToast({
@@ -197,6 +247,11 @@
 			},
 			// 查看物业公告详情
 			seeDetail(id) {
+				//判断当前房屋是否认证成功
+				if (this.status == 1 || this.status == 4) {
+					this.$refs.popup.open()
+					return
+				}
 				uni.navigateTo({
 					url: './detail?id=' + id
 				})
@@ -207,36 +262,66 @@
 			},
 			// 访客密码
 			visitorPass() {
+				//判断当前房屋是否认证成功
+				if (this.status == 1 || this.status == 4) {
+					this.$refs.popup.open()
+					return
+				}
 				uni.navigateTo({
 					url: "./visitorPass"
 				})
 			},
 			// 一键开门
 			openDoor() {
+				//判断当前房屋是否认证成功
+				if (this.status == 1 || this.status == 4) {
+					this.$refs.popup.open()
+					return
+				}
 				uni.navigateTo({
 					url: "../openDoor/openDoor"
 				})
 			},
 			// 在线保修
 			onlineRepairs() {
+				//判断当前房屋是否认证成功
+				if (this.status == 1 || this.status == 4) {
+					this.$refs.popup.open()
+					return
+				}
 				uni.navigateTo({
 					url: "../onlineRpair/index"
 				})
 			},
 			// 在线投诉
 			onlineComplain() {
+				//判断当前房屋是否认证成功
+				if (this.status == 1 || this.status == 4) {
+					this.$refs.popup.open()
+					return
+				}
 				uni.navigateTo({
 					url: "../complain/index"
 				})
 			},
 			// 更多跳转
 			moreBtn() {
+				//判断当前房屋是否认证成功
+				if (this.status == 1 || this.status == 4) {
+					this.$refs.popup.open()
+					return
+				}
 				uni.navigateTo({
 					url: './more'
 				})
 			},
 			// 选择房屋认证
 			selectHouse() {
+				//判断当前房屋是否认证成功
+				if (this.status == 4) {
+					this.$refs.popup.open()
+					return
+				}
 				uni.navigateTo({
 					url: "./changeHouse"
 				})
@@ -245,7 +330,65 @@
 	}
 </script>
 
-<style>
+<style lang="scss">
+	.popupClose {
+		width: 44rpx;
+		height: 44rpx;
+		position: absolute;
+		right: 20rpx;
+		top: 20rpx;
+
+	}
+	.topBg {
+		width: 100%;
+		height: 110rpx;
+		background: rgba(41, 138, 253, 1);
+	}
+	.popupBtn {
+		width: 342rpx;
+		height: 80rpx;
+		position: absolute;
+		bottom: 80rpx;
+		left: 128rpx;
+		background: rgba(41, 138, 253, 1);
+		color: #FFFFFF;
+		font-size: 32rpx;
+	}
+
+	.popupTitle {
+		width: 400rpx;
+		height: 40rpx;
+		font-size: 28rpx;
+		color: #999999;
+		position: absolute;
+		bottom: 232rpx;
+		left: 145rpx;
+	}
+
+	.popupImage {
+		width: 100%;
+		height: 300rpx;
+		/* 	background-image: url(../../static/success_popup@2x.png);
+	 position: absolute;
+	 top: -64rpx; */
+
+	}
+
+	.item {
+		.notInfo {
+			width: 100%;
+			height: 50rpx;
+			font-size: 36rpx;
+			font-family: PingFang SC;
+			font-weight: 400;
+			line-height: 50rpx;
+			color: rgba(36, 36, 36, 1);
+			margin: 0 auto;
+			margin-top: 100rpx;
+			text-align: center;
+		}
+	}
+
 	.topIcon {
 		width: 14rpx;
 		height: 9rpx;
@@ -403,8 +546,8 @@
 		border-radius: 14rpx;
 		margin: 0 auto;
 		/* border: 1rpx solid #333333; */
-		margin-top: 48rpx;
-		overflow:hidden; 
+		margin-top: 55rpx;
+		overflow: hidden;
 	}
 
 	.topBox {
@@ -420,6 +563,7 @@
 		position: absolute;
 		top: 0;
 		margin-top: 30rpx;
+		// background:rgba(41,138,253,1);
 	}
 
 	.topInfo {

pages/index/more.vue

@@ -2,7 +2,12 @@
 <template>
 	<view>
 		<view class="item">
-			<view class="mainInfo" v-for="(item,index) in listData" :key="index" @tap="seeDetail(item.id)">
+			<!-- <view class="notInfo" v-show="visible">暂无公告信息</view> -->
+			<view style="width:520rpx;margin: 0 auto;margin-top: 100rpx;" v-show="visible">
+				<image src="../../static/notData.png" style="width:520rpx ;height: 520rpx;"></image>
+				<view style="width:144rpx;height:50rpx;font-size:36rpx;margin: 0 auto;margin-top: 46rpx;">暂无数据</view>
+			</view>
+			<view class="mainInfo" v-for="(item,index) in listData" :key="index" @tap="seeDetail(item.id)" v-show="!visible">
 				<view class="left">
 					<view style="width: 100%;height: 42rpx;ont-size:30rx;font-family:PingFang SC;font-weight:bold;color:rgba(51,51,51,1);margin-top: 40rpx;">
 						{{item.title}}
@@ -26,27 +31,33 @@
 		data() {
 			return {
 				listData: [],
-				
+				visible: true
 			}
 		},
-		
-		mounted(){
+
+		mounted() {
 			this.getNoticeList()
 		},
-		methods:{
+		methods: {
 			// 获取公告数据
 			getNoticeList() {
 				uni.showLoading({
-					mask:true,
-					 title: '加载中'
+					mask: true,
+					title: '加载中'
 				})
 				this.http.httpRequest('/wxapplet/owner/notice/list', 'get', {
 					comtyId: uni.getStorageSync('comtyId')
 				}, true).then((res) => {
 					console.log(res)
 					if (res.code == 0) {
-						 uni.hideLoading();
-							this.listData = res.data.rows
+						// 判断当前是否有数据
+						if (res.data.rows.length == 0) {
+							this.visible = true
+						} else {
+							this.visible = false
+						}
+						this.listData = res.data.rows
+						uni.hideLoading();
 					} else {
 						uni.showToast({
 							title: res.msg,
@@ -56,10 +67,10 @@
 				})
 			},
 			// 查看物业公告详情
-			seeDetail(item){
-			
+			seeDetail(item) {
+
 				uni.navigateTo({
-					url:'./detail?id='+item
+					url: './detail?id=' + item
 				})
 			}
 		}
@@ -67,6 +78,18 @@
 </script>
 
 <style>
+	.notInfo {
+		width: 100%;
+		height: 50rpx;
+		font-size: 36rpx;
+		font-family: PingFang SC;
+		font-weight: 400;
+		line-height: 50rpx;
+		color: rgba(36, 36, 36, 1);
+		margin: 0 auto;
+		margin-top: 40rpx;
+		text-align: center;
+	}
 	.leftTag {
 		width: 56rpx;
 		height: 28rpx;
@@ -128,6 +151,6 @@
 		width: 688rpx;
 		margin: 0 auto;
 		margin-top: 20rpx;
-		
+
 	}
 </style>

pages/index/visitorPass.vue

@@ -36,13 +36,15 @@
 					</view>
 					<input class="uni-input item-input" type="number" v-model="form.phone" focus placeholder="请输入手机号" />
 				</view>
-				<view class="item" @tap="selectDate">
+				<picker mode="selector" :range="dateData" @change="selectDate" range-key="label" class="item">
+				<view class="item" >
 					<view class="left-icon">
 						<image src="../../static/visitor_icon_hour@2x.png" style="width: 100%;height: 100%;"></image>
 					</view>
 					<input class="uni-input item-input" v-model="form.date" :disabled="true" focus placeholder="访问时间" />
 					<image src="../../static/icon_combo@2x.png" style="width: 56rpx;height: 30rpx;margin-top: 68rpx;margin-right: 54rpx;"></image>
 				</view>
+				</picker>
 				<view class="item">
 					<view class="left-icon">
 						<image src="../../static/visitor_icon_regard@2x.png" style="width: 100%;height: 100%;"></image>
@@ -126,16 +128,12 @@
 					delta: 1
 				})
 			},
-			// 选择时间确定
-			confirm(data) {
-				this.form.date = data.item.label
-				this.time = data.item.value
-				this.computedTime(this.time)
-
-			},
+			
 			//选择时间打开组件
-			selectDate() {
-				this.$refs.date.show()
+			selectDate(e) {
+				this.form.date = this.dateData[e.target.value].label
+				this.time =  this.dateData[e.target.value].value
+				this.computedTime(this.time)
 			},
 			//获取临时开门码
 			loginNow() {
@@ -145,7 +143,15 @@
 				} else {
 					let idNumerReg = /^[1-9]\d{5}(18|19|20)\d{2}((0[1-9])|(1[0-2]))(([0-2][1-9])|10|20|30|31)\d{3}[0-9Xx]$/; //身份证正则
 					let phoneReg = /^1[3|4|5|7|8][0-9]{9}$/; //手机号正则校验
-					if (!idNumerReg.test(this.form.idNumber)) {
+					let nameReg = /^[\u4E00-\u9FA5\uf900-\ufa2d·s]{2,20}$/
+					if (!nameReg.test(this.form.name)) {
+						uni.showToast({
+							icon: 'none',
+							title: '请输入正确的姓名格式',
+							duration: 2000
+						});
+					} 
+					else if (!idNumerReg.test(this.form.idNumber)) {
 						console.log(this.form.idNumber)
 						uni.showToast({
 							icon: 'none',

pages/login/authorization.vue

@@ -30,7 +30,7 @@
 						this.http.httpRequest("/wxapplet/ownersid/WeChatLogin", 'post', {
 							phoneNumBer: uni.getStorageSync('phoneNumber'),
 							loginName: e.detail.userInfo.nickName,
-							avatar: e.detail.userInfo.avatarUrl,
+							avatar: e.detail.userInfo.avatarUrl?e.detail.userInfo.avatarUrl:'https://timgsa.baidu.com/timg?image&quality=80&size=b9999_10000&sec=1588928936819&di=1face6fba29d82c9bca1913661d43321&imgtype=0&src=http%3A%2F%2Fimg.qqzhi.com%2Fuploads%2F2019-04-11%2F212617551.jpg',
 							cardNo:uni.getStorageSync('idNumber')
 						},true).then((res)=>{
 							if(res.code==0){

pages/login/login.vue

@@ -14,7 +14,7 @@
 					<view class="left-icon">
 						<image src="../../static/login_icon_phone@2x.png" style="width: 100%;height: 100%;"></image>
 					</view>
-					<input class="uni-input item-input" v-model="form.phone" focus type="number" placeholder="请输入手机号" @input="changePhone" />
+					<input class="uni-input item-input" v-model="form.phone"  type="number" placeholder="请输入手机号" @input="changePhone" />
 				</view>
 				<view class="item">
 					<view class="left-icon">
@@ -150,14 +150,24 @@
 					}, true).then((res) => {
 						// 判断是否登陆成功
 						if (res.code == 0) {
-							
 							console.log(res)
 							uni.setStorageSync('userId',res.data[0].userId)
 							uni.setStorageSync('idNumber',res.data[0].idcardNum)
 							uni.setStorageSync('phoneNumber',res.data[0].phoneNumBer)
-							uni.navigateTo({
-								url: '../authentication/city'
-							})
+							// 判断当前是否已经认证过房屋了
+							if(res.data[0].comtyInfos.length>0){
+								uni.setStorageSync('comtyId',res.data[0].comtyInfos[0].cbId)
+								uni.setStorageSync('homeId',res.data[0].comtyInfos[0].ownerBases[0].bid)
+								uni.setStorageSync('homeAdress',res.data[0].comtyInfos[0].comtyName)
+								uni.switchTab({
+									url:'../index/index'
+								})
+							}else{
+								console.log('走这里')
+								uni.navigateTo({
+									url: '../authentication/city'
+								})
+							}
 							uni.hideLoading()
 						} else {
 							uni.hideLoading()

pages/mine/addFamily.vue

@@ -77,8 +77,16 @@
 				} else {
 					let idNumerReg = /^[1-9]\d{5}(18|19|20)\d{2}((0[1-9])|(1[0-2]))(([0-2][1-9])|10|20|30|31)\d{3}[0-9Xx]$/; //身份证正则
 					let phoneReg = /^1[3|4|5|7|8][0-9]{9}$/; //手机号正则校验
+					let nameReg = /^[\u4E00-\u9FA5\uf900-\ufa2d·s]{2,20}$/
+					if (!nameReg.test(this.name)) {
+						uni.showToast({
+							icon: 'none',
+							title: '请输入正确的姓名格式',
+							duration: 2000
+						});
+					} 
 					// 表单校验
-					if (!phoneReg.test(this.phone)) {
+					else if (!phoneReg.test(this.phone)) {
 						uni.showToast({
 							'icon': 'none',
 							title: "手机号码格式不正确"
@@ -107,6 +115,9 @@
 									'icon': 'success',
 									title: "保存成功"
 								})
+								this.name=''
+								this.phone=''
+								this.idNumber=''
 								setTimeout(()=>{
 									uni.navigateTo({
 										url: './family'

pages/mine/carList.vue

@@ -1,14 +1,10 @@
 <!-- 汽车通行记录 -->
 <template>
 	<view>
-		<view v-show="visible">
-			<!-- <view class="img">
-				<image src="../../static/null_image_checking@2x.png" style="width: 100%;height: 100%;"></image>
-			</view> -->
-			<view class="title">
-				暂无通行记录
-			</view>
-			</view>
+		<view style="width:520rpx;margin: 0 auto;margin-top: 100rpx;" v-show="visible">
+			<image src="../../static/notData.png" style="width:520rpx ;height: 520rpx;"></image>
+			<view style="width:144rpx;height:50rpx;font-size:36rpx;margin: 0 auto;margin-top: 46rpx;">暂无数据</view>
+		</view>
 		<view style="margin-top: 34rpx;" v-show="!visible">
 			<view class="item" v-for="(item,index) in data" :key="index" :class="{active:isPrimeNum(index)}">
 				<view class="content">

pages/mine/family.vue

@@ -1,13 +1,9 @@
 <template>
 	<view class="">
-		<view v-show="visible">
-			<!-- <view class="img">
-				<image src="../../static/null_image_checking@2x.png" style="width: 100%;height: 100%;"></image>
-			</view> -->
-			<view class="title">
-				暂无数据
-			</view>
-		</view>
+	<view style="width:520rpx;margin: 0 auto;margin-top: 100rpx;" v-show="visible">
+		<image src="../../static/notData.png" style="width:520rpx ;height: 520rpx;"></image>
+		<view style="width:144rpx;height:50rpx;font-size:36rpx;margin: 0 auto;margin-top: 46rpx;">暂无数据</view>
+	</view>
 		<!-- <view style="width: 100%;text-align: center;margin-top: 20rpx;" v-if="data.length==0">暂无数据</view> -->
 		<uni-swipe-action v-show="!visible">
 			<uni-swipe-action-item :options="options" @click="onClick(item)" @change="change" v-for="(item,index) in data" :key="index">
@@ -57,6 +53,11 @@
 		created() {
 			this.getListData()
 		},
+		onUnload() {
+			uni.switchTab({
+				url:'./mine'
+			})
+		},
 		mounted() {
 
 

pages/mine/mine.vue

@@ -70,6 +70,16 @@
 				</view>
 			</view>
 		</view>
+		<!-- 认证房屋是否通过提示 -->
+		<uniPopup ref='popup' type="center">
+			<view style="width: 600rpx;height: 522rpx;background-color: #fff;border-radius: 10rpx;" class="popupBox">
+				<image src="../../static/auditing_popup.png" style="width:85%;height: 100%;margin-top: -50rpx;margin-left: 30rpx;"></image>
+				<view class="popupTitle" v-if="status==1">当前认证房屋正在审核中</view>
+				<view class="popupTitle" v-else-if="status==4">当前暂无房屋绑定,请重新认证</view>
+				<button class="popupBtn" @tap="popupClose" v-if="status==1">我知道了</button>
+				<button class="popupBtn" @tap="goTapHouse" v-else-if="status==4">去认证</button>
+			</view>
+		</uniPopup>
 	</view>
 </template>
 
@@ -83,17 +93,33 @@
 				carNum: 0, //汽车数量
 				bikeNum: 0, //自行车数量
 				headPhoto:'',
+				status:''
 			}
 		},
 		onShow() {
 			this.getCarData()
 			// this.getUserData()
+			this.userName=uni.getStorageSync('userName')
+			this.headImg=uni.getStorageSync('headImg')
+			this.userPhone=uni.getStorageSync('userPhone')
+			this.status=uni.getStorageSync('houseStatus')
 		},
 		onLoad() {
-
+			
+			this.status=uni.getStorageSync('houseStatus')
 		},
 		methods: {
-			
+			//重新认证房屋
+			goTapHouse(){
+				uni.navigateTo({
+					url:'../authentication/city'
+				})
+				this.$refs.popup.close()
+			},
+			// 关闭弹窗
+			popupClose(){
+				this.$refs.popup.close()
+				},
 			// 获取汽车车辆数
 			getCarData() {
 				uni.showLoading({
@@ -118,48 +144,80 @@
 			},
 			// 查看电动车
 			seeMyBike() {
+				if(this.status==1 ||this.status==4){
+					this.$refs.popup.open()
+					return
+				}
 				uni.navigateTo({
 					url: './myBike'
 				})
 			},
 			// 访客信息
 			visitorInfo() {
+				if(this.status==1||this.status==4){
+					this.$refs.popup.open()
+					return
+				}
 				uni.navigateTo({
 					url: "../visitor/historyList"
 				})
 			},
 			// 查看个人资料
 			seeMyInfo() {
+				if(this.status==1||this.status==4){
+					this.$refs.popup.open()
+					return
+				}
 				uni.navigateTo({
 					url: "myInfo"
 				})
 			},
 			// 查看我的汽车
 			seeMyCar() {
+				if(this.status==1||this.status==4){
+					this.$refs.popup.open()
+					return
+				}
 				uni.navigateTo({
 					url: "myCar"
 				})
 			},
 			// 查看我的房屋
 			seeMyhouse() {
+				if(this.status==1||this.status==4){
+					this.$refs.popup.open()
+					return
+				}
 				uni.navigateTo({
 					url: "myHouse"
 				})
 			},
 			//更换人脸模板
 			changeFace() {
+				if(this.status==1||this.status==4){
+					this.$refs.popup.open()
+					return
+				}
 				uni.navigateTo({
 					url: "./face"
 				})
 			},
 			// 查看我的家人
 			seeMyFamily() {
+				if(this.status==1||this.status==4){
+					this.$refs.popup.open()
+					return
+				}
 				uni.navigateTo({
 					url: "./family"
 				})
 			},
 			// 查看我的消息
 			seeMyMessage() {
+				if(this.status==1||this.status==4){
+					this.$refs.popup.open()
+					return
+				}
 				uni.navigateTo({
 					url: "./message"
 				})
@@ -170,6 +228,43 @@
 </script>
 
 <style>
+	.popupClose {
+		width: 44rpx;
+		height: 44rpx;
+		position: absolute;
+		right: 20rpx;
+		top: 20rpx;
+	
+	}
+	.popupBtn {
+		width: 342rpx;
+		height: 80rpx;
+		position: absolute;
+		bottom: 80rpx;
+		left: 128rpx;
+		background: rgba(41, 138, 253, 1);
+		color: #FFFFFF;
+		font-size: 32rpx;
+	}
+	
+	.popupTitle {
+		width: 400rpx;
+		height: 40rpx;
+		font-size: 28rpx;
+		color: #999999;
+		position: absolute;
+		bottom: 232rpx;
+		left: 170rpx;
+	}
+	
+	.popupImage {
+		width: 100%;
+		height: 300rpx;
+		/* 	background-image: url(../../static/success_popup@2x.png);
+	 position: absolute;
+	 top: -64rpx; */
+	
+	}
 	.leftIcon {
 		width: 38rpx;
 		height: 40rpx;

pages/mine/myCar.vue

@@ -53,13 +53,12 @@
 			},
 			//获取加载数据
 			loadData(pullScroll) {
-				
 				this.pageNum = pullScroll.page
 				setTimeout(() => {
 					this.http.httpRequest('/wxapplet/ownercar/list', 'get', {
 						// cardNo: uni.getStorageSync('idNumber'),
 						pageNum: pullScroll.page,
-						pageSize: 3,
+						pageSize: 10,
 						cardId: uni.getStorageSync('idNumber'),
 					}).then((res) => {
 						console.log(res)

pages/mine/myHouse.vue

@@ -6,7 +6,7 @@
 			 		<image src="../../static/null_image_checking@2x.png" style="width: 100%;height: 100%;"></image>
 			 </view>
 			 <view class="title">
-			 	房屋正在审核中，暂无数据~
+			 	暂无数据~
 			 </view>
 		 </view>
 		<view class="item" v-for="(item,index) in data" :key="index" v-show="!visible">
@@ -46,9 +46,7 @@
 		onUnload() {
 			uni.navigateTo({
 				url: './mine',
-			})
-			      
-			 
+			})    
 		},
 		methods: {
 			// 删除房屋
@@ -65,6 +63,9 @@
 								houseId: item
 							}, true).then((res) => {
 								if (res.code == 0) {
+									// if(item==uni.getStorageSync('comtyId') && id==uni.getStorageSync('homeId')){
+										
+									// }
 									uni.showToast({
 										title: '删除成功',
 										'icon': 'success'
@@ -105,9 +106,17 @@
 					if (res.code == 0) {
 						if(res.data.length==0){
 							 this.visible=true
+							 uni.removeStorageSync('comtyId')
+							 uni.removeStorageSync('homeId')
+							 uni.removeStorageSync('homeAdress')
+							 uni.setStorageSync('houseStatus','4')
 						}else{
 							this.visible=false
 							this.data = res.data
+							// uni.removeStorageSync('houseStatus')
+							uni.setStorageSync('comtyId',this.data[0].comtyId)
+							uni.setStorageSync('homeId',this.data[0].houseId)
+							uni.setStorageSync('homeAdress',this.data[0].houseName)
 						}
 						uni.hideLoading()
 					} else {

pages/mine/myInfo.vue

@@ -95,7 +95,7 @@
 						this.phone=res.data.phoneNum
 						this.userName=res.data.loginName
 						uni.setStorageSync('userName',res.data.loginName)
-						uni.setStorageSync('userPhoen',res.data.phoneNum)
+						uni.setStorageSync('userPhone',res.data.phoneNum)
 						this.status=res.data.status
 						this.photo=res.data.facePhoto
 						this.facePhoto=this.getBase64ImageUrl(res.data.facePhoto)
@@ -249,9 +249,7 @@
 		margin: 0 auto;
 		display: flex;
 		justify-content: space-between;
-
 	}
-
 	.left {
 		width: 64rpx;
 		height: 44rpx;
@@ -262,7 +260,6 @@
 		margin-top: 22rpx;
 		opacity: 1;
 	}
-
 	.right {
 		width: 110rpx;
 		margin-top: 10rpx;

pages/onlineRpair/index.vue

@@ -14,9 +14,9 @@
 					<view class="text">
 						{{item.content}}
 					</view>
-					<view class="img" v-show="item.photosUrlList.length>0" @tap="prew(item)">
-						<image :src="img" style="width: 180rpx;height: 180rpx;padding-right: 10rpx;margin-bottom: 10rpx;" v-for="(img,index) in item.photosUrlList"
-						 :key="index"></image>
+					<view class="img" v-show="item.photosUrlList.length>0">
+						<image :src="img" style="width: 180rpx;height: 180rpx;padding-right: 10rpx;margin-bottom: 10rpx;" @tap="prew(item.photosUrlList,index1)"
+						 v-for="(img,index1) in item.photosUrlList" :key="index1"></image>
 					</view>
 					<!-- 回复信息 -->
 					<!-- 		<view class="replay">
@@ -34,7 +34,7 @@
 					</view>
 				</view> -->
 					<!-- 我要评论 -->
-					<view class="bottomBtn" @tap="myTalk(item.id)">我的评价</view>
+					<view class="bottomBtn" @tap="myTalk(item.id)" v-show="item.userId==userId &&item.state==2">我的评价</view>
 					<view class="date">{{(item.createTime).substr(0,16)}}</view>
 				</view>
 			</view>
@@ -51,7 +51,8 @@
 	export default {
 		data() {
 			return {
-				total:0,//总条数
+				userId: uni.getStorageSync('userId'),
+				total: 0, //总条数
 				data: [],
 				pageNum: 1, //页数
 				pageSize: 3, //每页显示多少条数
@@ -60,15 +61,20 @@
 		onLoad() {
 			this.refresh();
 		},
+		onUnload() {
+			uni.switchTab({
+				url:'../index/index'
+			})
+		},
 		methods: {
 			// 预览图片
-			prew(item){
+			prew(item, index) {
 				uni.previewImage({
-				  // current:item.imgArr[index],
-				 	urls:item.photosUrlList,
-				success:(res)=>{
-				
-				},
+					current: item[index],
+					urls: item,
+					success: (res) => {
+
+					},
 				})
 			},
 			// 刷新页面
@@ -96,25 +102,25 @@
 						comtyId: uni.getStorageSync("comtyId")
 					}).then((res) => {
 						console.log(res)
-							if(res.code==0){
-								this.total=res.data.total
-								// 判断当前数据是否加载完毕
-								if(this.data.length==res.data.total){
-										pullScroll.finish();
-								}else{
-									pullScroll.success();
-									let data = res.data.rows
-									this.data = this.data.concat(data);
-								}
-							
-							}else{
+						if (res.code == 0) {
+							this.total = res.data.total
+							// 判断当前数据是否加载完毕
+							if (this.data.length == res.data.total) {
 								pullScroll.finish();
-								uni.showToast({
-									title:res.msg,
-									"icon":'none'
-								})
+							} else {
+								pullScroll.success();
+								let data = res.data.rows
+								this.data = this.data.concat(data);
 							}
-					}).catch(()=>{
+
+						} else {
+							pullScroll.finish();
+							uni.showToast({
+								title: res.msg,
+								"icon": 'none'
+							})
+						}
+					}).catch(() => {
 						pullScroll.finish();
 					})
 					// // 判断数据是否加载完毕

pages/onlineRpair/repairSuccess.vue

@@ -18,9 +18,9 @@
 			}
 		},
 		onUnload() {
-			wx.reLaunch({
-			      url: '/pages/onlineRpair/index',
-			    })
+			wx.navigateTo({
+				url: '/pages/onlineRpair/index',
+			})
 		}
 	}
 </script>

pages/onlineRpair/repairsEvaluate.vue

@@ -24,7 +24,7 @@
 					评价内容
 				</view>
 				<view class="textContent">
-					<textarea placeholder="请填写评价" style="width: 95%;height: 96%;margin-left: 10rpx;margin-top: 10rpx;" v-model="textRea"></textarea>
+					<textarea placeholder="请填写评价" style="width: 95%;height: 96%;margin-left: 10rpx;margin-top: 10rpx;" v-model="textRea" cursor-spacing="120" maxlength="300"></textarea>
 				</view>
 				<!-- 图片盒字 -->
 				<!-- <view style="width:646rpx;height: 114rpx;position: absolute;left: 24rpx;bottom: 40rpx;display: flex;">
@@ -87,9 +87,13 @@
 						// 判断请求是否成功 0 成功 
 						if (res.code == 0) {
 							uni.setStorageSync('rateType',1)
-							uni.navigateTo({
-								url: './evalueSuccess'
-							})
+							this.textRea=''
+							this.starNum=0
+							setTimeout(()=>{
+								uni.navigateTo({
+									url: './evalueSuccess'
+								})
+							},1000)
 							uni.hideLoading()
 						} else {
 							uni.hideLoading()

pages/onlineRpair/wantRepair.vue

@@ -15,72 +15,115 @@
 			<view class="main">
 				<image src="../../static/appraise_bgimage@2x.png" style="width: 100%;height: 100%;"></image>
 				<image src="../../static/guarantee_icon_summary@2x.png" class="mainImg"></image>
-				<view class="fa">报修摘要</view>
-				<view class="star">
-					<input placeholder="请填写报修摘要" style="width:95%;height: 100%;margin: 0 auto;" v-model="digest" />
-				</view>
+				<view class="fa">报修类型</view>
+				<picker mode="selector" :range="typeData" @change="chooseType" class="star" range-key="label">
+				<!-- <view class="star"> -->
+					<input placeholder="请选择报修类型" style="width:95%;height: 100%;margin: 0 auto;" v-model="digest" :disabled="true" />
+				<!-- </view> -->
+				</picker>
 				<image src="../../static/guarantee_icon_content@2x.png" class="contentImg"></image>
 				<view class="contentTitle">
 					报修内容
 				</view>
 				<view class="textContent">
-					<textarea placeholder="请填写报修内容" style="width: 95%;height: 96%;margin-left: 10rpx;margin-top: 10rpx;" v-model="textRea"></textarea>
+					<textarea placeholder="请填写报修内容"  cursor-spacing="120" style="width: 95%;height: 96%;margin-left: 10rpx;margin-top: 10rpx;" v-model="textRea" maxlength="301"></textarea>
 				</view>
 				<!-- 图片盒字 -->
 				<view style="width:646rpx;height: 114rpx;position: absolute;left: 24rpx;bottom: 40rpx;display: flex;">
 					<view style="height: 114rpx;margin-right: 10rpx;display: flex;justify-content: space-between;" v-show="imgData">
-						<image style="width: 114rpx;height: 114rpx;margin-right: 10rpx;" :src="item" v-for="(item,index) in imgData" :key="index" @longtap="deleteImg(index)" @tap="prew(imgData)"></image>
+						<image style="width: 114rpx;height: 114rpx;margin-right: 10rpx;" :src="item" v-for="(item,index) in imgData" :key="index"
+						 @longpress="deleteImg(index)" @tap="prew(imgData,index)"></image>
 					</view>
-					<image src="../../static/circle_image@2x.png" style="width: 114rpx;height: 114rpx;" @tap="uploadImg(item)"></image>
+					<image src="../../static/circle_image@2x.png" style="width: 114rpx;height: 114rpx;" @tap="uploadImg(item)" v-if="imgData.length<3"></image>
+					<view style="font-size: 18rpx;line-height:114rpx;color: #999999;margin-left: 10rpx;" v-if="imgData.length>0">长按图片可以进行删除</view>
 				</view>
+				
 			</view>
 		</view>
-		<button class="submit" :class="{active:digest && textRea}" @tap="submit" >提交</button>
+		<button class="submit" :class="{active:digest && textRea}" @tap="submit">提交</button>
 	</view>
 </template>
-
 <script>
 	export default {
 		data() {
 			return {
+				typeData: [{
+					label: '维修',
+					value: '1',
+				},
+				{
+					label: '隐患',
+					value: '2',
+				},
+				{
+					label: '环卫',
+					value: '3',
+				},
+				{
+					label: '报修',
+					value: '4',
+				}],
 				isloading: false, //加载
 				digest: '', //报修摘要
+				digestValue:'1',
 				textRea: '', //评价内容
 				starNum: 0, //星星数量
 				phoneHeight: 0, //手机状态栏的高度
 				isShow: false,
-				imgData: []
+				imgData: [],
+				num:3
 			}
 		},
-		components: {},
+		components: {
+			
+		},
 		created() {
 			// 获取状态栏的高度
 			this.phoneHeight = uni.getSystemInfoSync().statusBarHeight
 		},
 		methods: {
+			// 计算还能选择几张
+			  formatNum(){
+				this.num=3-this.imgData.length  
+			  },
+			// 选择报修类型确定
+			 confirm(data){
+				this.digest=data.item.label
+				this.digestValue=data.value
+			 },
+			 // 选择保修类型
+			 chooseType(e){
+				this.digest=this.typeData[e.target.value].label
+				this.digestValue=this.typeData[e.target.value].value
+			 },
 			// 预览图片
-			prew(item){
+			prew(item,index) {
 				uni.previewImage({
-				  // current:item.imgArr[index],
-				 	urls:item,
-				success:(res)=>{
-				
-				},
+					current:item[index],
+					urls: item,
+					success: (res) => {
+
+					},
 				})
 			},
 			// 长按图片删除
-			deleteImg(index){
-				 wx.showModal({
-				   title: '提示',
-				   content: '确定要删除此图片吗？',
-				   success:  (res) =>{
-				    if (res.confirm) {
-				     this.imgData.splice(index, 1);
-				    } else if (res.cancel) {
-				      return false;    
-				     }
-				   }
-				  })
+			deleteImg(index) {
+				uni.showModal({
+					title: '提示',
+					content: '确定要删除此图片吗？',
+					success: (res) => {
+						if (res.confirm) {
+							this.imgData.splice(index, 1);
+							this.formatNum()
+							uni.showToast({
+								title:'删除成功',
+								'icon':'success'
+							})
+						} else if (res.cancel) {
+							return false;
+						}
+					}
+				})
 			},
 			// 选择评分
 			changeRate(e) {
@@ -88,7 +131,7 @@
 			},
 			// 图片上传
 			uploadImg(item) {
-				if (this.imgData.length == 3) {
+				if (this.imgData.length >= 3) {
 					uni.showToast({
 						"icon": 'none',
 						title: "最多可以上传三张图片"
@@ -96,10 +139,14 @@
 					return
 				} else {
 					uni.chooseImage({
-						count: 3, //默认9
+						count: this.num, //默认9
 						sizeType: ['original', 'compressed'], //可以指定是原图还是压缩图，默认二者都有
 						// sourceType: ['album'], //从相册选择
 						success: (res) => {
+							uni.showLoading({
+								mask:true,
+								title:'上传中'
+							})
 							console.log(res)
 							var successUp = 0; //成功个数
 							var failUp = 0; //失败个数
@@ -118,13 +165,30 @@
 					name: 'photo',
 					method: 'post',
 					success: (resp) => {
-						let data =JSON.parse(resp.data)
+						let data = JSON.parse(resp.data)
 						console.log(data)
-						 let reg=/,$/gi;
-						  let str=data.data.imagesPath.replace(reg,"");
-						  this.imgData.push(str)
-						  console.log(this.imgData)
-						successUp++;
+						if (data.code == 0) {
+							let reg = /,$/gi;
+							let str = data.data.imagesPath.replace(reg, "");
+							if (this.imgData.length < 3) {
+								this.imgData.push(str)
+								this.formatNum()
+								uni.hideLoading()
+								setTimeout(()=>{
+									uni.showToast({
+										title:'上传成功',
+										'icon':'success'
+									})
+								},500)
+							}
+							successUp++;
+						} else {
+							uni.hideLoading()
+							uni.showToast({
+								title: '上传失败,' + data.msg,
+								'icon': 'none'
+							})
+						}
 					},
 					fail: (res) => {
 						failUp++;
@@ -136,7 +200,7 @@
 					complete: () => {
 						i++;
 						if (i == length) {
-							
+
 						} else { //递归调用uploadDIY函数
 							this.uploadDIY(filePaths, successUp, failUp, i, length);
 						}
@@ -150,23 +214,38 @@
 					return
 				} else {
 					uni.showLoading({
-						mask:true,
-						title:'加载中'
+						mask: true,
+						title: '加载中'
 					})
+					if(this.textRea.length>300){
+						uni.showToast({
+							title:'报修内容最多只能输入300个字符',
+							'icon':'none'
+						})
+						return
+					}
 					this.http.httpRequest('/wxapplet/ownerreprair/add', 'post', {
 						userId: uni.getStorageSync('userId'),
 						createBy: uni.getStorageSync('createBy'),
 						content: this.textRea,
 						PhotosUrlList: this.imgData,
-						reprairType: this.digest,
-						comtyId:uni.getStorageSync('comtyId'),
+						reprairType: this.digestValue,
+						comtyId: uni.getStorageSync('comtyId'),
 						ownerPhone: uni.getStorageSync('phoneNumber')
 					}, true).then((res) => {
 						if (res.code == 0) {
-							uni.navigateTo({
-								url: './repairSuccess'
+							uni.showToast({
+								title:'提交成功',
+								'icon':'success'
 							})
-							uni.hideLoading()
+							this.textRea=''
+							this.digest=''
+							setTimeout(()=>{
+								uni.navigateTo({
+									url: './index'
+								})
+								uni.hideLoading()
+							},1000)
 						} else {
 							uni.hideLoading()
 							uni.showToast({
@@ -174,7 +253,7 @@
 								'icon': 'none'
 							})
 						}
-					}).catch(()=>{
+					}).catch(() => {
 						uni.hideLoading()
 					})
 				}

pages/openDoor/openDoor.vue

@@ -4,8 +4,12 @@
 		<image src="../../static/history_top_bgimage@2x.png" style="width: 100%;height: 278rpx;"></image>
 		<view class="main">
 			<!-- 循环体 -->
+			<view style="width:520rpx;margin: 0 auto;margin-top: 300rpx;" v-show="visible">
+				<image src="../../static/notData.png" style="width:520rpx ;height: 520rpx;"></image>
+				<view style="width:144rpx;height:50rpx;font-size:36rpx;margin: 0 auto;margin-top: 46rpx;">暂无数据</view>
+			</view>
 			<!-- <scroll ref="pullScroll" :pullDown="pullDown" :pullUp="loadData"> -->
-			<view class="item" v-for="(item,index) in doorData" :key="index">
+			<view class="item" v-for="(item,index) in doorData" :key="index" v-show="!visible">
 				<view class="leftIcon">
 					<image src="../../static/open_icon@2x.png" style="width: 100%;height: 100%;"></image>
 				</view>
@@ -35,7 +39,8 @@
 				page: 1,
 				limit: 5,
 				doorData: [], //列表数据
-				list: []
+				list: [],
+				visible:true
 			}
 		},
 		onLoad() {
@@ -55,11 +60,11 @@
 				}, true).then((res) => {
 					console.log(res)
 					if (res.code == 0) {
+						// 判断是否有数据
 						if (res.data.length == 0) {
-							uni.showToast({
-								title: '暂无数据',
-								'icon': 'none'
-							})
+							this.visible=true
+						}else{
+							this.visible=false
 						}
 						this.doorData = res.data
 						uni.hideLoading()
@@ -77,7 +82,7 @@
 			// 开门
 			openDoor(id) {
 				this.http.httpRequest('/wxapplet/owneradvice/mqopendoor/json', 'post', {
-					cardNo: uni.getStorageSync('userId'),
+					cardNo: uni.getStorageSync('idNumber'),
 					comtyId: uni.getStorageSync('comtyId'),
 					deviceCode: id,
 					phoneNumBer: uni.getStorageSync('phoneNumber'),
@@ -100,68 +105,6 @@
 					url: "./openDoorList"
 				})
 			},
-			refresh() {
-				this.$nextTick(() => {
-					this.$refs.pullScroll.refresh();
-				});
-			},
-			pullDown(pullScroll) {
-				setTimeout(() => {
-					this.loadData(pullScroll);
-				}, 200);
-			},
-			loadData(pullScroll) {
-				console.log(pullScroll)
-				setTimeout(() => {
-					// if (pullScroll.page == 1) {
-					// 	this.doorData = [];
-					// }
-					let data = [{
-							title: '花园小区',
-							info: '1号楼 2单元 602'
-						}, {
-							title: '花园小区',
-							info: '1号楼 2单元 602'
-						}, {
-							title: '花园小区',
-							info: '1号楼 2单元 602'
-						},
-						{
-							title: '花园小区',
-							info: '1号楼 2单元 602'
-						}, {
-							title: '花园小区',
-							info: '1号楼 2单元 602'
-						},
-						{
-							title: '花园小区',
-							info: '1号楼 2单元 602'
-						},
-						{
-							title: '花园小区',
-							info: '1号楼 2单元 602'
-						},
-						{
-							title: '花园小区',
-							info: '1号楼 2单元 602'
-						},
-						{
-							title: '花园小区',
-							info: '1号楼 2单元 602'
-						},
-						{
-							title: '花园小区',
-							info: '1号楼 2单元 602'
-						},
-					]
-					this.doorData = this.doorData.concat(data);
-					if (this.doorData.length >= 15) {
-						pullScroll.finish();
-					} else {
-						pullScroll.success();
-					}
-				}, 500);
-			}
 		},
 		components: {
 			scroll
@@ -170,6 +113,18 @@
 </script>
 
 <style scoped>
+	.notInfo {
+		width: 100%;
+		height: 50rpx;
+		font-size: 36rpx;
+		font-family: PingFang SC;
+		font-weight: 400;
+		line-height: 50rpx;
+		color: rgba(36, 36, 36, 1);
+		margin: 0 auto;
+		margin-top: 40rpx;
+		text-align: center;
+	}
 	.btn {
 		width: 702rpx;
 		height: 90rpx;

pages/openDoor/openDoorList.vue

@@ -4,11 +4,15 @@
 	<view class="">
 		<image src="../../static/history_top_bgimage@2x.png" style="width: 100%;height: 278rpx;"></image>
 		<view class="main">
+			<view style="width:520rpx;margin: 0 auto;margin-top: 300rpx;" v-show="visible">
+				<image src="../../static/notData.png" style="width:520rpx ;height: 520rpx;"></image>
+				<view style="width:144rpx;height:50rpx;font-size:36rpx;margin: 0 auto;margin-top: 46rpx;">暂无数据</view>
+			</view>
 			<!-- <view class="infoBox" style="margin-top: 40rpx;"> -->
 				<!-- <view class="title">
 					番茄小区
 				</view> -->
-				<view class="item" v-for="(item,index) in data" :key="index">
+				<view class="item" v-for="(item,index) in data" :key="index" v-show="!visible">
 					<view class="leftIcon">
 						<image src="../../static/open_icon@2x.png" style="width: 100%;height: 100%;"></image>
 					</view>
@@ -32,7 +36,8 @@
 	export default {
 		data() {
 			return {
-				data:[]
+				data:[],
+				visible:true
 			}
 		},
 		mounted() {
@@ -52,10 +57,9 @@
 					if (res.code == 0) {
 						// 判断返回数据是否为空
 						if(res.data.rows.length==0){
-							uni.showToast({
-								title:'暂无数据',
-								'icon':'none'
-							})
+							this.visible=true
+						}else{
+							this.visible=false
 						}
 						this.data=res.data.rows
 						uni.hideLoading()
@@ -82,6 +86,18 @@
 </script>
 
 <style scoped>
+	.notInfo {
+		width: 100%;
+		height: 50rpx;
+		font-size: 36rpx;
+		font-family: PingFang SC;
+		font-weight: 400;
+		line-height: 50rpx;
+		color: rgba(36, 36, 36, 1);
+		margin: 0 auto;
+		margin-top: 40rpx;
+		text-align: center;
+	}
 	.title {
 		width: 100%;
 		height: 44rpx;

pages/register/register.vue

@@ -14,19 +14,19 @@
 					<view class="left-icon">
 						<image src="../../static/register_icon_name@2x.png" style="width: 100%;height: 100%;"></image>
 					</view>
-					<input class="uni-input item-input" v-model="form.name" focus placeholder="请输入真实姓名" />
+					<input class="uni-input item-input" v-model="form.name"  placeholder="请输入真实姓名" />
 				</view>
 				<view class="item">
 					<view class="left-icon">
 						<image src="../../static/register_icon_identity@2x.png" style="width: 100%;height: 100%;"></image>
 					</view>
-					<input class="uni-input item-input" v-model="form.idNumber" focus placeholder="请输入身份证号" />
+					<input class="uni-input item-input" v-model="form.idNumber"  placeholder="请输入身份证号" />
 				</view>
 				<view class="item">
 					<view class="left-icon">
 						<image src="../../static/login_icon_phone@2x.png" style="width: 100%;height: 100%;"></image>
 					</view>
-					<input class="uni-input item-input" v-model="form.phone" focus placeholder="请输入手机号" type="number" @input="changePhone" />
+					<input class="uni-input item-input" v-model="form.phone"  placeholder="请输入手机号" type="number" @input="changePhone" />
 				</view>
 				<view class="item">
 					<view class="left-icon">
@@ -143,8 +143,10 @@
 								}
 							}, 1000)
 						}
-						this.http.httpRequest('/wxapplet/ownersid/shortmessaging','get',{phoneNumBer:this.form.phone},true).then((res)=>{
-							
+						this.http.httpRequest('/wxapplet/ownersid/shortmessaging', 'get', {
+							phoneNumBer: this.form.phone
+						}, true).then((res) => {
+
 						})
 					}
 
@@ -162,7 +164,15 @@
 					return
 				} else {
 					let idNumerReg = /^[1-9]\d{5}(18|19|20)\d{2}((0[1-9])|(1[0-2]))(([0-2][1-9])|10|20|30|31)\d{3}[0-9Xx]$/; //身份证正则
-					if (!idNumerReg.test(this.form.idNumber)) {
+					let nameReg = /^[\u4E00-\u9FA5\uf900-\ufa2d·s]{2,20}$/
+					if (!nameReg.test(this.form.name)) {
+						uni.showToast({
+							icon: 'none',
+							title: '请输入正确的姓名格式',
+							duration: 2000
+						});
+					} 
+					else if (!idNumerReg.test(this.form.idNumber)) {
 						console.log(this.form.idNumber)
 						uni.showToast({
 							icon: 'none',
@@ -171,33 +181,33 @@
 						});
 					} else {
 						uni.showLoading({
-							mask:true,
-							title:'加载中'
+							mask: true,
+							title: '加载中'
 						})
 						this.http.httpRequest('/wxapplet/ownersid/add', 'post', {
 							loginName: this.form.name,
 							idcardNum: this.form.idNumber,
 							phoneNumBer: this.form.phone,
-							authcode:this.form.code
+							authcode: this.form.code
 						}, true).then((res) => {
 							// 判断接口是否请求成功 0 成功 1 步成功
-							if(res.code==0){
+							if (res.code == 0) {
 								uni.hideLoading()
 								this.$refs.popup.open()
-							}else{
+							} else {
 								uni.hideLoading()
 								uni.showToast({
-										title:res.msg,
-										icon:'none'
-									})
+									title: res.msg,
+									icon: 'none'
+								})
 								// this.form.phone=''
 								// this.form.code=''
 								this.isShow = false
 								this.isGet = true
-								this.num=0
+								this.num = 0
 							}
-							
-						}).catch(()=>{
+
+						}).catch(() => {
 							uni.hideLoading()
 						})
 

pages/user/access/access.vue

@@ -1,22 +0,0 @@
-<template>
-	<view class="jyy-bg">
-		
-	</view>
-</template>
-
-<script>
-	export default {
-		data() {
-			return {
-				
-			};
-		}
-	}
-</script>
-
-<style>
-.jyy-bg{
-	height: 1250upx;
-	background-image: url("/static/access/bg.png");
-}
-</style>

pages/user/account/account.vue

@@ -1,290 +0,0 @@
-<template>
-	<view class="uni-flex uni-column" id="account">
-		<view class="uni-flex uni-column">
-			<uni-list>
-				<view class="uni-flex space-between align-items listHead ">
-					<view class="uni-flex  headRt">头像</view>
-					<view class="uni-flex headLf space-between">
-						<!-- #ifndef H5 -->
-						<avatar
-							selWidth="200px"
-							selHeight="400upx"
-							@upload="myUpload"
-							:avatarSrc="user.avatarUrl"
-							avatarStyle="width: 120upx; height: 120upx; "
-							v-if="avatarUrl != null"
-						></avatar>
-						<avatar
-							selWidth="200px"
-							selHeight="400upx"
-							@upload="myUpload"
-							:avatarSrc="url"
-							avatarStyle="width: 120upx; height: 120upx; "
-							v-if="avatarUrl == null"
-						></avatar>
-						<!-- #endif -->
-						<!-- #ifdef H5 -->
-						<view class="uploadImg">
-							<robby-image-upload
-								v-model="imageData"
-								fileKeyName="data"
-								:limit="1"
-								:server-url="serverUrl"
-								:showUploadProgress="show"
-								:form-data="formData"
-								@delete="deleteImage"
-								@add="addImage"
-							></robby-image-upload>
-						</view>
-						<!-- #endif -->
-						<ni-icon class="uni-icon-wrapper uni-flex justify-align-center" :size="20" color="#bbb" type="arrowright" />
-					</view>
-				</view>
-				<uni-list-item title="昵称" :show-badge="true" :badge-text="nickName" @click="nickNameReset" />
-				<uni-list-item :show-badge="true" :badge-text="user.mobile" title="手机号" @click="showTip" />
-			</uni-list>
-		</view>
-	</view>
-</template>
-
-<script>
-import uniList from '@/components/uni-list/uni-list.vue';
-import uniListItem from '@/components/uni-list-item/uni-list-item02.vue';
-import robbyImageUpload from '../../../components/robby-image-upload/robby-image-uploadL.vue';
-var graceChecker = require('../../../common/graceChecker.js');
-
-import { mapState, mapMutations } from 'vuex';
-import niIcon from '@/components/ni-iconss/ni-icons.vue';
-import avatar from '@/components/yq-avatar/yq-avatar.vue';
-export default {
-	computed: {
-		...mapState(['hasLogin', 'forcedLogin', 'jyyUser'])
-	},
-	components: {
-		uniList,
-		uniListItem,
-		niIcon,
-		avatar,
-		robbyImageUpload
-	},
-	methods: {
-		...mapMutations(['login']),
-		deleteImage() {},
-		addImage: function(e) {
-			if (e.allImages.length > 0) {
-				uni.showToast({
-					title: '修改成功',
-					icon: 'success',
-					duration: 1000
-				});
-				this.user.avatarUrl = e.allImages[0];
-				this.avatarUrl = e.allImages[0];
-				this.login(JSON.stringify(this.user));
-				this.postData();
-			}
-		},
-		postData() {
-			uni.request({
-				url: this.webUrl + 'SaveInfo',
-				method: 'POST',
-				data: {
-					userid: this.user.id,
-					avatarUrl: this.avatarUrl
-				},
-				header: {
-					'content-type': 'application/x-www-form-urlencoded'
-				},
-				success: res => {
-					uni.hideLoading();
-				},
-				fail: () => {},
-				complete: () => {}
-			});
-		},
-		showTip() {
-			uni.showToast({
-				title: '手机号不可修改！',
-				duration: 1000,
-				icon: 'none'
-			});
-		},
-		nickNameReset() {
-			uni.navigateTo({
-				url: 'nickNameReset'
-			});
-		},
-		myUpload(rsp) {
-			this.user.avatarUrl = rsp.path;
-			uni.uploadFile({
-				url: this.webUrl + 'Upload',
-				filePath: this.user.avatarUrl,
-				name: 'data',
-				success: res => {
-					uni.showToast({
-						title: '修改成功',
-						icon: 'success',
-						duration: 1000
-					});
-					this.user.avatarUrl = res.data;
-					this.avatarUrl = res.data;
-					this.login(JSON.stringify(this.user));
-					this.postData();
-				},
-				fail: err => {
-					uni.showModal({
-						content: err.errMsg,
-						showCancel: false
-					});
-					uni.hideLoading();
-				},
-				complete: () => {}
-			});
-		},
-		formSubmit: function(e) {
-			var rule = [
-				{
-					name: 'nickName',
-					checkType: 'notnull',
-					checkRule: '1,4',
-					errorMsg: '请填写账号呢称'
-				},
-				{
-					name: 'mobile',
-					checkType: 'string',
-					checkRule: '11',
-					errorMsg: '手机号码11个字符'
-				}
-			];
-
-			//进行表单检查
-			var formData = e.detail.value;
-			var checkRes = graceChecker.check(formData, rule);
-			if (checkRes) {
-				uni.request({
-					url: this.webUrl + 'SaveInfo',
-					method: 'POST',
-					data: {
-						user: JSON.stringify(this.user)
-					},
-					header: {
-						'content-type': 'application/x-www-form-urlencoded'
-					},
-					success: res => {
-						uni.hideLoading();
-						this.login(JSON.stringify(this.user));
-						uni.showModal({
-							title: '系统提示',
-							content: res.data.result.resultInfo,
-							showCancel: false,
-							success: function(res) {
-								if (res.confirm) {
-									uni.switchTab({
-										url: '../user/user'
-									});
-								}
-							}
-						});
-					},
-					fail: () => {},
-					complete: () => {}
-				});
-			} else {
-				uni.showToast({
-					title: graceChecker.error,
-					icon: 'none'
-				});
-			}
-		}
-	},
-	onShow() {
-		this.user = JSON.parse(this.jyyUser);
-		this.nickName = this.user.nickName;
-	},
-	onLoad(e) {
-		if (!this.hasLogin) {
-			uni.navigateTo({
-				url: '../login/login'
-			});
-		} else {
-			this.user = JSON.parse(this.jyyUser);
-			this.nickName = this.user.nickName;
-			// #ifdef MP-WEIXIN
-			this.avatarUrl = this.user.avatarUrl;
-			// #endif
-			// #ifdef H5
-			this.imageData[0] = this.user.avatarUrl;
-			// #endif
-		}
-	},
-	data() {
-		return {
-			imageData: [],
-			serverUrl: this.webUrl + 'Upload',
-			show: true,
-			formData: {
-				userId: 2
-			},
-			user: {},
-			nickName: '',
-			avatarUrl: '',
-			url: '../../static/user/02.png'
-		};
-	}
-};
-</script>
-
-<style>
-.uni-list-item__container {
-}
-.headLf {
-	/* width: 25%; */
-	margin-right: 30upx;
-	/* padding-right: 30upx; */
-}
-.headRt {
-	font-size: 32upx;
-	color: #333333;
-}
-.listHead {
-	/* width: 100%; */
-	height: 164upx;
-	margin-left: 28upx;
-	box-sizing: border-box;
-	border-bottom: 1upx solid #f2f2f2;
-}
-
-.uni-badge-success {
-	background: none;
-	color: #999999;
-}
-
-#account .uni-badge-success {
-	font-size: 28upx;
-}
-
-.uni-list-item__content-title {
-	color: #333333;
-}
-
-.uni-list-item:first-child .uni-list-item__content .uni-list-item__content-title {
-	display: flex;
-	align-items: center;
-	height: 84upx;
-}
-
-.uni-list-item__container {
-	position: relative;
-	padding: 20upx 30upx !important;
-}
-
-.uni-list-item__icon {
-	position: absolute;
-	right: 50upx;
-}
-
-.uni-list-item__icon image {
-	width: 100upx;
-	height: 100upx;
-	border-radius: 50%;
-}
-</style>

pages/user/account/nickNameReset.vue

@@ -1,109 +0,0 @@
-<template>
-	<view class="uni-flex uni-column nickNameReset jz_address">
-		<view class="uni-flex">
-			<input v-model="user.nickName" />
-		</view>
-		<view class="addBtnwrap uni-flex justify-align-center">
-			<view class="addBtn uni-flex justify-align-center" @click="submit">保存昵称</view>
-		</view>
-	</view>
-</template>
-
-<script>
-	import {
-		mapState,
-		mapMutations
-	} from 'vuex'
-	export default {
-		computed: {
-			...mapState(['hasLogin', 'forcedLogin', 'jyyUser'])
-		},
-		data() {
-			return {
-				user: {}
-			}
-		},
-		onLoad() {
-			if (!this.hasLogin) {
-				uni.navigateTo({
-					url: '../login/login',
-				});
-			} else {
-				this.user = JSON.parse(this.jyyUser);
-			}
-
-		},
-		methods: {
-			...mapMutations(['login']),
-			submit() {
-				if (this.nickName == '') {
-					uni.showToast({
-						duration: 1000,
-						title: '昵称不为空',
-						icon: "none"
-					})
-				} else {
-					uni.showLoading({
-						title: '更新中'
-					})
-					uni.request({
-						url: this.webUrl + 'SaveInfo',
-						method: 'POST',
-						data: {
-							userid: this.user.id,
-							nickName: this.user.nickName
-						},
-						header: {
-							'content-type': 'application/x-www-form-urlencoded'
-						},
-						success: res => {
-							uni.hideLoading();
-							this.login(JSON.stringify(this.user));
-
-							uni.showToast({
-								icon: "none",
-								title: res.data.result.resultInfo,
-								success() {
-									setTimeout(() => {
-										uni.navigateBack({
-											delta: 1
-										})
-									}, 1000)
-								}
-							})
-						},
-						fail: () => {},
-						complete: () => {}
-					});
-				}
-			}
-		}
-	}
-</script>
-
-<style>
-	.jz_address .addBtnwrap {
-		width: 100%;
-		margin-top: 30upx;
-	}
-
-	.nickNameReset input {
-		width: 100%;
-		border: 0;
-		background: #FFFFFF;
-		height: 80upx;
-		line-height: 80upx;
-		padding-left: 20upx;
-		box-sizing: border-box;
-	}
-
-	.jz_address .addBtn {
-		width: 550rpx;
-		height: 115rpx;
-		color: #FFFFFF;
-		font-size: 28rpx;
-		margin: 0 auto;
-		background: url(../../../static/btn.png) no-repeat;
-		background-size: 550rpx 115rpx;
-	}
-</style>

pages/user/address/address.vue

@@ -1,224 +0,0 @@
-<template>
-	<view class="uni-flex uni-column address jz_address">
-
-		<view class="uni-flex addresslist uni-column" v-if="addresses.length>0">
-			<view class="addressitem uni-flex space-between align-items" v-for="(item,key) in addresses" :key="key">
-				<view class="itemleft uni-flex uni-column" style="width: 120upx; word-wrap:break-word;"  @click="goOrder(item)">
-					<view class="lefNick">{{item.nickName}}</view>
-					<view v-if="item.defaultVal" class="leftBtn">默认</view>
-				</view>
-				<view class="itemcenter uni-flex uni-column"  @click="goOrder(item)">
-					<view class="centerPhone">{{item.mobile}}</view>
-					<view class="centerAddress">{{item.siteStr}}{{item.addStr}}</view>
-				</view>
-				<view class="itemright uni-flex  justify-align-center">
-					<view class="uni-flex uni-column">
-						<text @click="goService(item)" class="uni-h5">编辑</text>
-						<text @click="del(item,key)" class="uni-h5">删除</text>
-					</view>
-					<view class="itemRt uni-flex justify-align-center" style="margin-left: 10upx;" v-if="url=='../order/order'" @click="goOrder(item)">
-						<uni-icon type="arrowright" size="20" color="#999999"></uni-icon>
-					</view>
-				</view>
-			</view>
-
-			<load-more :loadingType="loadingType" :contentText="contentText"></load-more>
-			<view @click="newService()" class="addBtn-wrap uni-flex justify-align-center" v-if="addresses.length>0">
-				<view class="addBtn uni-flex justify-align-center">新建收货地址</view>
-			</view>
-		</view>
-		<view class="uni-lists uni-flex justify-align-center uni-column" v-if="addresses.length==0">
-			<view class="addressImg uni-flex justify-align-center">
-				<image src="../../../static/address/01.png"></image>
-			</view>
-			<view class="noaddressTitle">1个地址也没有,</view>
-			<view class="noaddressTitle">快去添加收货地址买买吧</view>
-			<view @click="add()" class="addBtn-wrap uni-flex justify-align-center" v-if="addresses.length==0">
-				<view class="addBtn uni-flex justify-align-center">新建收货地址</view>
-			</view>
-		</view>
-
-	</view>
-</template>
-
-<script>
-	import {
-		mapState,
-		mapMutations
-	} from 'vuex'
-
-	import loadMore from '@/components/uni-load-more.vue';
-	import uniIcon from '../../../components/uni-icon/uni-icon.vue';
-	var index;
-	export default {
-		computed: {
-			...mapState(['hasLogin', 'forcedLogin', 'jyyUser'])
-		},
-		data() {
-			return {
-				user: {},
-				url: "",
-				addresses: [],
-				loadingType: 0,
-				contentText: {
-					contentdown: "上拉显示更多",
-					contentrefresh: "正在加载...",
-					contentnomore: "没有更多数据了"
-				}
-			};
-		},
-		onPullDownRefresh() {
-			this.init();
-			setTimeout(function() {
-				uni.stopPullDownRefresh();
-			}, 1000);
-		},
-		onShow() {
-			this.init();
-		},
-		onLoad(e) {
-			this.url = e.url;
-			console.log(this.url)
-			this.init();
-		},
-		methods: {
-			init() {
-				index = 1;
-				if (!this.hasLogin) {
-					uni.navigateTo({
-						url: '../login/login',
-					});
-				} else {
-					this.user = JSON.parse(this.jyyUser);
-					this.getData();
-				}
-			},
-			goOrder: function(e) {
-				if (this.url == undefined || this.url == "undefined") {
-					return false;
-				} else {
-					uni.redirectTo({
-						url: "../order/order?addressId=" + e.id
-					})
-				}
-			},
-			add() {
-				uni.redirectTo({
-					url: "../addressService/addressService?url=../address/address"
-				})
-			},
-			del(e, key) {
-				uni.showModal({
-					content: '确认删除？',
-					success: (res) => {
-						if (res.confirm) {
-							uni.showLoading({
-								title: "操作中"
-							})
-							uni.request({
-								url: this.webUrl + 'DelAddress',
-								method: 'POST',
-								data: {
-									id: e.id,
-									userid: this.user.id
-								},
-								header: {
-									'content-type': 'application/x-www-form-urlencoded'
-								},
-								success: res => {
-									uni.hideLoading();
-									uni.showToast({
-										title: res.data.result.resultInfo,
-										icon: "none"
-									});
-									e.isDeleted = true;
-									this.addresses.splice(key, 1)
-								},
-								fail: () => {},
-								complete: () => {}
-							});
-						}
-					}
-				})
-			},
-			getData() {
-				if (this.loadingType !== 0) {
-					return;
-				}
-				this.loadingType = 1;
-				let user = JSON.parse(this.jyyUser);
-				uni.request({
-					url: this.webUrl + 'AddressList',
-					method: 'POST',
-					data: {
-						pageIndex: index,
-						userid: user.id
-					},
-					header: {
-						'content-type': 'application/x-www-form-urlencoded'
-					},
-					success: res => {
-						if (res.data.result.addressList.length > 0) {
-							this.addresses = this.addresses.concat(res.data.result.addressList);
-						} else {
-							this.loadingType = 2;
-							return;
-						}
-						if (index == parseInt(res.data.result.pages)) {
-							this.loadingType = 2;
-							return;
-						} else {
-							this.loadingType = 0;
-						}
-						index++;
-					},
-					fail: () => {},
-					complete: () => {}
-				});
-			},
-			newService() {
-				uni.navigateTo({
-					url: "../addressService/addressService?id=0"
-				})
-			},
-			goService: function(e) {
-				if (this.url == undefined) {
-					uni.navigateTo({
-						url: "../addressService/addressService?id=" + e.id
-					})
-				} else {
-					uni.redirectTo({
-						url: "../addressService/addressService?id=" + e.id + "&url=" + this.url
-					})
-				}
-
-			}
-		},
-		onReachBottom() {
-			this.getData();
-		},
-		components: {
-			loadMore,
-			uniIcon
-		}
-	}
-</script>
-<style>
-	page {
-		background: #FFFFFF;
-	}
-
-	.jz_address .addBtn {
-		background: url(../../../static/btn.png) no-repeat;
-		width: 550upx;
-		height: 115upx;
-		color: #FFFFFF;
-		font-size: 28upx;
-		margin: 0 auto;
-		background-size: 550upx 115upx;
-	}
-	
-	.jz_address .addressitem .itemright {
-		margin: 0;
-	}
-</style>

pages/user/addressService/addressService.vue

@@ -1,221 +0,0 @@
-<template>
-	<view class="uni-flex jz_addressServer">
-		<view class="uni-flex uni-flex-item  uni-common-mt uni-column">
-			<form class="uni-flex uni-flex-item uni-column form" @submit="formSubmit" @reset="formReset">
-				<view class="uni-flex uni-row align-items">
-					<view class="uni-flex uni-flex-item">收货人</view>
-					<view class="uni-flex uni-flex-item4 justify-align-center uni-form-item">
-						<input class="uni-input uni-flex-item" v-model="address.nickName" name="nickName" placeholder="请填写收货人姓名" />
-						<view class="uni-flex justify-align-center"><image src="../../../static/address/05.png" class="addPeopleImg"></image></view>
-					</view>
-				</view>
-				<view class="uni-flex  uni-row align-items">
-					<view class="uni-flex uni-flex-item">手机号码</view>
-					<view class="uni-flex uni-flex-item4 uni-form-item"><input class="uni-input" v-model="address.mobile" name="mobile" placeholder="请填写收货人手机号"/></view>
-				</view>
-				<view class="uni-flex  uni-row align-items">
-					<view class="uni-flex uni-flex-item">地区</view>
-					<view class="uni-flex uni-flex-item4 uni-form-item">
-						<input :value="pickerText" class="uni-input" disabled name="area" placeholder="选择地区" @click="showMulLinkageThreePicker"  />
-					</view>
-				</view>
-				<view class="uni-flex  uni-row align-items">
-					<view class="uni-flex uni-flex-item">详细地址</view>
-					<view class="uni-flex uni-flex-item4 uni-form-item"><input class="uni-input" v-model="address.addStr" name="addStr" placeholder="如街道、楼牌号等" /></view>
-				</view>
-				<view class="spaceone"></view>
-				<view class="space"></view>
-				<view class="uni-flex  uni-row align-items">
-					<view class="uni-flex uni-flex-item4">设为默认</view>
-					<view class="uni-flex uni-flex-item"><switch :checked="checked" @change="switch1Change" color="#e40001" /></view>
-				</view>
-				<view class="uni-flex justify-align-center add"><button class="btn" formType="submit">⊕ 保存地址</button></view>
-			</form>
-			
-		</view>
-		<mpvue-city-picker
-			:themeColor="themeColor"
-			ref="mpvueCityPicker"
-			:pickerValueDefault="cityPickerValueDefault"
-			@onCancel="onCancel"
-			@onConfirm="onConfirm"
-		></mpvue-city-picker>
-	</view>
-</template>
-
-<script>
-var graceChecker = require('../../../common/graceChecker.js');
-
-import mpvueCityPicker from '../../../components/mpvue-citypicker/mpvueCityPicker.vue';
-
-import { mapState, mapMutations } from 'vuex';
-
-export default {
-	data() {
-		return {
-			cityPickerValueDefault: [0, 0, 1],
-			themeColor: '#007AFF',
-			pickerText: '',
-			mode: '',
-			address: {},
-			user: {},
-			checked: false,
-			url: ''
-		};
-	},
-	components: {
-		mpvueCityPicker
-	},
-	computed: {
-		...mapState(['hasLogin', 'forcedLogin', 'jyyUser'])
-	},
-	methods: {
-		switch1Change: function(e) {
-			this.address.defaultVal = e.target.value;
-		},
-		onCancel(e) {
-			//console.log(e)
-		},
-		showMulLinkageThreePicker() {
-			this.$refs.mpvueCityPicker.show();
-		},
-		onConfirm(e) {
-			this.pickerText = e.label;
-			this.address.province = e.value[0];
-			this.address.city = e.value[1];
-			this.address.district = e.value[2];
-			this.address.siteStr = e.label;
-		},
-		formSubmit: function(e) {
-			var rule = [
-				{
-					name: 'nickName',
-					checkType: 'notnull',
-					checkRule: '1,4',
-					errorMsg: '请填写收货人'
-				},
-				{
-					name: 'mobile',
-					checkType: 'string',
-					checkRule: '11',
-					errorMsg: '手机号码11个字符'
-				},
-				{
-					name: 'area',
-					checkType: 'notnull',
-					checkRule: '',
-					errorMsg: '请选择地区'
-				},
-				{
-					name: 'addStr',
-					checkType: 'notnull',
-					checkRule: '',
-					errorMsg: '请填写详细地址'
-				}
-			];
-			//进行表单检查
-			var formData = e.detail.value;
-			var checkRes = graceChecker.check(formData, rule);
-			if (checkRes) {
-				uni.request({
-					url: this.webUrl + 'SaveAddress',
-					method: 'POST',
-					data: {
-						address: JSON.stringify(this.address),
-						id: this.address.id,
-						userid: this.user.id
-					},
-					header: {
-						'content-type': 'application/x-www-form-urlencoded'
-					},
-					success: res => {
-						uni.hideLoading();
-						uni.showToast({
-							title: res.data.result.resultInfo,
-							icon: 'none'
-						});
-						if (res.data.result.isSuccess) {
-							uni.redirectTo({								
-								url: '../address/address?url=' + this.url
-							});
-						}
-					},
-					fail: () => {},
-					complete: () => {}
-				});
-			} else {
-				uni.showToast({
-					title: graceChecker.error,
-					icon: 'none'
-				});
-			}
-		},
-		getData() {
-			uni.request({
-				url: this.webUrl + 'Address',
-				method: 'POST',
-				data: {
-					id: this.address.id
-				},
-				header: {
-					'content-type': 'application/x-www-form-urlencoded'
-				},
-				success: res => {
-					if (res.data.result.isSuccess) {
-						this.showAddress = true;
-						this.address = res.data.address;
-						this.cityPickerValueDefault = [res.data.address.province, res.data.address.city, res.data.address.district];
-						this.pickerText = res.data.address.siteStr;
-						this.checked = res.data.address.defaultVal;
-					}
-				},
-				fail: () => {},
-				complete: () => {}
-			});
-		},
-		formReset: function(e) {
-			console.log('清空数据');
-			this.chosen = '';
-		}
-	},
-	onLoad(e) {
-		if (!this.hasLogin) {
-			uni.navigateTo({
-				url: '../login/login'
-			});
-		} else {
-			this.url = e.url;
-			this.user = JSON.parse(this.jyyUser);
-			if (e.id == undefined) {
-				this.address.id = 0;
-				uni.setNavigationBarTitle({
-					title: '添加收货地址'
-				});
-			} else {
-				this.address.id = e.id;
-				uni.setNavigationBarTitle({
-					title: '修改收货地址'
-				});
-				this.getData();
-			}
-		}
-	},
-	onBackPress() {
-		if (this.$refs.mpvueCityPicker.showPicker) {
-			this.$refs.mpvueCityPicker.pickerCancel();
-			return true;
-		}
-	},
-	onUnload() {
-		if (this.$refs.mpvueCityPicker.showPicker) {
-			this.$refs.mpvueCityPicker.pickerCancel();
-		}
-	}
-};
-</script>
-
-<style>
-
-
-
-</style>

pages/user/agent/applyfor.vue

@@ -1,314 +0,0 @@
-<template>
-	<view class="jz_beginCard uni-flex uni-column">
-		<view class="beginCardImg" style="height: 360upx;"><image src="https://www.jinzun99.com/static/04.png" style="height: 360upx;"></image></view>
-		<form class="uni-flex uni-flex-item uni-column form" @submit="formSubmit" @reset="formReset">
-			<view class="uni-flex-item justify-align-center uni-flex uni-column">
-				<!-- 多选 -->
-				<view class="beginCard_name uni-flex align-items" v-if="allSelectStatus">
-					<view class="uni-flex-item">申请商品：(合计: {{agencyArrs.length}})</view>
-					<view class="uni-flex-item3 uni-flex uni-column " :class="[agencyArrs.length>1?'agencyArrs':'agencyArrsSingle']">
-						<view class="agencyArr"  v-for="(item,index) in agencyArrs" :key="index">
-							<view class="productPic uni-flex align-items">
-								<image :src="item.pic"></image>
-								<text class="uni-flex-item AagencyTitle">{{ item.title }}</text>
-							</view>
-						</view>
-					</view>
-				</view>
-				<!-- 单选 -->
-				<view class="beginCard_name uni-flex align-items" v-if="agency.productTitle">
-					<view class="uni-flex-item">申请商品：</view>
-					<view class="uni-flex-item3 uni-flex">
-						<view class="product_pic uni-flex"><image :src="agency.productPic"></image></view>
-						<view class="product_title uni-flex justify-align-center">{{ agency.productTitle }}</view>
-					</view>
-				</view>
-				
-				<view class="beginCard_name uni-flex align-items" v-if="agency.address||allSelectStatus==true">
-					<view class="uni-flex-item">代理地区：</view>
-					<input type="text" class="uni-flex-item3" v-model="agency.address" name="address" disabled="disabled" />
-				</view>
-				<view class="beginCard_name uni-flex align-items">
-					<view class="uni-flex-item">真实姓名：</view>
-					<input type="text" class="uni-flex-item3" v-model="nickName" name="nickName" placeholder="请填写姓名" />
-				</view>
-				<view class="beginCard_name uni-flex align-items">
-					<view class="uni-flex-item">手机号码：</view>
-					<input type="text" class="uni-flex-item3" v-model="mobile" name="mobile" placeholder="请填写手机号码" />
-				</view>
-				<view class="beginCard_name  uni-flex align-items" v-if="user.licenseUrl == null">
-					<view class="uni-flex-item">营业执照：</view>
-					<view class="uni-flex-item3">
-						<robby-image-upload
-							v-model="imageData"
-							fileKeyName="data"
-							:limit="1"
-							:server-url="serverUrl"
-							:showUploadProgress="show"
-							:form-data="formData"
-							@delete="deleteImage"
-							@add="addImage"
-						></robby-image-upload>
-					</view>
-				</view>
-				<view class="beginCard_btn"><button formType="submit" class="uni-flex justify-align-center">提交申请</button></view>
-			</view>
-		</form>
-	</view>
-</template>
-
-<script>
-var graceChecker = require('../../../common/graceChecker.js');
-import robbyImageUpload from '../../../components/robby-image-upload/robby-image-upload.vue';
-import { mapState, mapMutations } from 'vuex';
-
-export default {
-	components: {
-		robbyImageUpload
-	},
-	data() {
-		return {
-			nickName: '',
-			mobile: '',
-			user: {},
-			show: true,
-			imageData: [],
-			serverUrl: this.webUrl + 'Upload',
-			formData: {
-				userId: 2
-			},
-			agency: {},
-			allSelectStatus: false,//单选状态,
-			agencyArrs: []//多选代理产品信息
-		};
-	},
-	computed: {
-		...mapState(['hasLogin', 'jyyUser','agencyArr'])
-	},
-	onLoad(e) {
-		if (!this.hasLogin) {
-			uni.navigateTo({
-				url: '../login/login'
-			});
-		} else {
-			if(e.key){//多选申请代理
-				this.agencyArrs = JSON.parse(this.agencyArr);//代理商品信息
-				this.agency.label = e.key;//代理地址
-				this.agency.address = e.key;//代理地址
-				this.agency.id = e.addressId;//代理地址id
-				this.allSelectStatus = true;//多选状态
-				this.user = JSON.parse(this.jyyUser);
-				this.mobile = this.user.mobile;
-				this.nickName = this.user.nickName;
-			}
-			else if (e.path) {//会员中心申请代理
-				this.agency.productId = 0;
-				this.agency.productTitle = '';
-				this.agency.productPic = '';
-				this.agency.address = '';
-				this.user = JSON.parse(this.jyyUser);
-				this.mobile = this.user.mobile;
-				this.nickName = this.user.nickName;
-			} else {//单选申请代理
-				this.agency = JSON.parse(decodeURIComponent(e.agency));
-				for (var k in this.agency) {
-					if (k == 'value') {
-						delete this.agency[k];
-					}
-					if (k == 'cityCode') {
-						delete this.agency[k];
-					}
-				}
-				this.user = JSON.parse(this.jyyUser);
-				this.mobile = this.user.mobile;
-				this.nickName = this.user.nickName;
-			}
-		}
-	},
-	methods: {
-		deleteImage: function(e) {
-			console.log(e);
-		},
-		addImage: function(e) {
-			console.log(e);
-		},
-		formSubmit: function(e) {
-			let image = this.imageData.length > 0 ? this.imageData[0] : '';
-			var rule = [
-				{
-					name: 'nickName',
-					checkType: 'notnull',
-					checkRule: '1,4',
-					errorMsg: '请填写真实姓名'
-				},
-				{
-					name: 'mobile',
-					checkType: 'string',
-					checkRule: '11',
-					errorMsg: '手机号码11个字符'
-				}
-			];
-			//进行表单检查
-			var formData = e.detail.value;
-			var checkRes = graceChecker.check(formData, rule);
-			if (checkRes) {
-				if (this.user.licenseUrl == null && image == '') {
-					uni.showToast({
-						title: '请上传运营执照',
-						icon: 'none'
-					});
-				} else {
-					if (image == '') {
-						image = this.user.licenseUrl;
-					}
-					let Agency = {};
-					if(this.allSelectStatus){//多选申请代理
-					
-					for(let i=0;i<this.agencyArrs.length;i++){
-						delete this.agencyArrs[i].title;
-						delete this.agencyArrs[i].pic;
-					}
-					console.log(this.agencyArrs)
-						Agency.agency = this.agencyArrs;
-						Agency.area ={};
-						Agency.area.id = this.agency.id;
-						Agency.area.label = this.agency.label;
-					}else if(this.agency.productId==0){//会员中心申请代理
-						 Agency = {}
-					}
-					else{//单选申请代理
-						Agency.agency = [{
-							id:this.agency.productId
-						}];
-						Agency.area ={};
-						Agency.area.id = this.agency.id;
-						Agency.area.label = this.agency.label;
-					}
-					
-					uni.request({
-						url: this.webUrl + 'AgentApplyfor',
-						method: 'POST',
-						data: {
-							nickName: this.nickName,
-							mobile: this.mobile,
-							imageData: image,
-							userid: this.user.id,
-							agency: JSON.stringify(Agency)
-						},
-						header: {
-							'content-type': 'application/x-www-form-urlencoded'
-						},
-						success: res => {
-							uni.hideLoading();
-							uni.showToast({
-								title: res.data.result.resultInfo,
-								icon: 'none'
-							});
-							setTimeout(() => {
-								uni.switchTab({
-									url: '../user/user'
-								});
-							}, 500);
-						},
-						fail: () => {},
-						complete: () => {}
-					});
-				}
-			} else {
-				uni.showToast({
-					title: graceChecker.error,
-					icon: 'none'
-				});
-			}
-		}
-	}
-};
-</script>
-
-<style>
-/*  修改的*/
-
-/* 一个商品时候的高度 */
-.agencyArrsSingle {
-	height: 124upx;
-}
-	
-/* 多个商品时候的高度 */
-.agencyArrs {
-	height: 280upx;
-	overflow-y: scroll;
-}
-
-.AagencyTitle {
-	margin-left: 20upx;
-}
-.productPic {
-	margin-bottom: 30upx;
-}
-.productPic image {
-	width: 120upx;
-	height: 120upx;
-	border: 1upx solid #dfdfdf;
-	border-radius: 8upx;
-}
-
-
-
-
-
-
-.jz_beginCard .beginCard_btn {
-	margin: 50upx 0 0 0;
-}
-
-.jz_beginCard .beginCard_btn button {
-	display: block;
-	width: 550upx;
-	height: 115upx;
-	line-height: 115upx;
-	font-size: 28upx;
-	color: #ffffff;
-	background: url(../../../static/btn.png) no-repeat;
-	background-size: 550upx 115upx;
-}
-
-.product_pic {
-	width: 120upx;
-	height: 120upx;
-	margin: 20upx 0;
-}
-
-.product_pic image {
-	width: 120upx;
-	height: 120upx;
-	border: 1upx solid #dfdfdf;
-	border-radius: 8upx;
-}
-
-
-.product_title {
-	margin-left: 30upx;
-}
-
-.jz_beginCard .beginCard_name {
-	height: auto;
-	margin-top: 20upx;
-	padding: 15upx 40upx;
-}
-
-.jz_beginCard .beginCard_name .imageItem,
-.jz_beginCard .beginCard_name .imageUpload {
-	width: 120upx;
-	height: 120upx;
-	line-height: 100upx;
-	font-size: 100upx;
-	margin: 0 !important;
-}
-
-.jz_beginCard .beginCard_name .imageUploadContainer {
-	margin: 0;
-	padding: 20upx 0;
-	margin-left: 0;
-	padding-left: 0;
-}
-</style>

pages/user/agent/index.vue

@@ -1,1025 +0,0 @@
-<template>
-	<view class="uni-flex lists jz_lists uni-column jz_myfit jz_agent cart jz_cart ">
-		<view class="tab-search uni-column" style="background-color: #F1F1F1;">
-			<view class="tabList">
-				<scroll-view class="uni-flex uni-swiper-tab" scroll-x :scroll-left="scrollLeft" id="tab-bars">
-					<view v-for="(tab, i) in categorys" :key="i" class="swiper-tab-list" :id="'tab' + tab.id" :data-current="index" @click="changeTab(i, tab)">
-						<view class="productTitle-item uni-flex uni-column">
-							<view :class="['picname', curIndex == i ? 'activeLine' : '']">{{ tab.title }}</view>
-						</view>
-					</view>
-				</scroll-view>
-			</view>
-
-			<view class="search uni-flex ">
-				<view class="uni-flex-item uni-flex search-input">
-					<input
-						placeholder="请选择地区"
-						@input="inputChange"
-						v-model="key"
-						:focus="isFocus"
-						@focus="focus"
-						@blur="blur"
-						class="uni-flex-item"
-						disabled="disabled"
-						@click="showMulLinkageThreePicker"
-					/>
-					<view class="icon icon-del uni-flex justify-align-center" style="height: 100%;" @click.stop="clear" v-if="isDelShow"><icon type="clear" size="12"></icon></view>
-				</view>
-
-				<view class="searchBtn uni-flex justify-align-center" @click="search">
-					<image src="../../../static/search02.png"></image>
-					<text>搜索</text>
-				</view>
-			</view>
-			<view class="uni-flex uni-filter">
-				<view class="uni-filter-line"></view>
-				<view class="uni-flex  uni-filter-item" :class="[item.sel ? 'uni-filter-sel' : '']" v-for="(item, key) in filter" :key="key" @click="filterList(item, key)">
-					{{ item.title }}
-				</view>
-			</view>
-		</view>
-
-		<view class="agent-product uni-flex uni-column">
-			<view class="agentTop uni-flex space-between" id="list">
-				<view class="topItem uni-flex uni-column align-items " v-if="item.filter" v-for="(item, key) in products" :key="key" @click.stop="Agencychecked(products, key)">
-					<view class="uni-flex  topItem-wrap">
-						<image
-							class="image topImg"
-							:class="{ lazy: !item.display }"
-							:id="'lazy' + key"
-							:data-index="0"
-							@load="imageOnLoad(item, key)"
-							:src="item.display ? item.pic : ''"
-						/>
-						<view class="loadbox" :class="{ loaded: item.loaded }"><view class="load"></view></view>
-					</view>
-					<view class=" uni-flex  uni-column">
-						<view class="uni-flex agencyTitle justify-align-center" v-if="!item.show">{{ item.title }}</view>
-						<view class=" agencyTitle titleSingle " v-if="item.show">{{ item.title }}</view>
-						<view class="uni-flex justify-align-center" style="color: #f00000;" v-if="user.agency == 1">￥{{ item.salePrice.toFixed(2) }}</view>
-						<!-- 全部部分-->
-						<view class="uni-flex space-between selectContent justify-align-center" v-if="btnStatus == -1 || btnStatus == 2">
-							<view class="uni-flex justify-align-center center common" v-if="item.agency == 0">可代理</view>
-							<view class="uni-flex justify-align-center center common" v-if="item.agency == 1">被代理</view>
-							<view class="uni-flex justify-align-center center common" v-if="item.agency == 2">已代理</view>
-						</view>
-						<!-- 非全部部分 -->
-						<view class="uni-flex space-between selectContent justify-align-center" v-if="(btnStatus == 1) | (btnStatus == 0)">
-							<view class="uni-flex common justify-align-center" v-if="item.agency == 0">可代理</view>
-							<view class="uni-flex justify-align-center uni-flex-item common" v-if="item.agency == 1">被代理</view>
-							<view class="uni-flex common justify-align-center" v-if="item.agency == 2">已代理</view>
-						</view>
-					</view>
-					<view class="selectBtn uni-flex " v-if="item.agency == 0 && btnStatus == 0">
-						<image src="../../../static/select.png" v-if="!item.select"></image>
-						<image src="../../../static/selectActive.png" v-if="item.select"></image>
-					</view>
-				</view>
-			</view>
-			<view class="agentBottom uni-flex space-between"></view>
-		</view>
-		<load-more :loadingType="loadingType" :contentText="contentText" class="loadMore"></load-more>
-		<backTop :src="backTop.src" :scrollTop="backTop.scrollTop"></backTop>
-		<mpvue-city-picker
-			:themeColor="themeColor"
-			ref="mpvueCityPicker"
-			:pickerValueDefault="cityPickerValueDefault"
-			@onCancel="onCancel"
-			@onConfirm="onConfirm"
-			@onReset="onReset"
-		></mpvue-city-picker>
-		<!-- v-if="products.length > 0 && canAgent && btnStatus == 0" -->
-		<view class="uni-flex uni-row footer" v-if="products.length > 0 && btnStatus == 0 && isShow == true">
-			<view class="uni-flex uni-flex-item ">
-				<view class="uni-flex item-sel "><view :class="[yuan, { bg: allSelect }]" @click="AllSelect()"></view></view>
-				<view class="uni-flex uni-flex-item itemAll">全选</view>
-				<view class="uni-flex uni-flex-item3"></view>
-				<view class="uni-flex uni-flex-item3 justify-align-center">
-					<view class="uni-flex uni-flex-item btn" @click="submit()" :class="{ activeBg: bgChange }">提交申请 共({{ filterCount }})</view>
-				</view>
-			</view>
-		</view>
-		<!-- 可代理按钮 -->
-		<!-- <view class="beginCard_btn" v-if="products.length > 0 && canAgent && btnStatus == 0">
-			<button @click="submit" class="uni-flex justify-align-center">提交申请 共({{ filterCount }})个</button>
-		</view> -->
-	</view>
-</template>
-
-<script>
-import { mapState, mapMutations } from 'vuex';
-import mpvueCityPicker from '@/components/mpvue-citypicker/mpvueCityPicker.vue';
-import util from '../../../common/util.js';
-import address from '../../../common/getAddessId.js';
-import amap from '../../../common/amap-wx.js';
-import loadMore from '@/components/uni-load-more.vue';
-import backTop from '@/components/uni-top.vue';
-
-var index;
-export default {
-	computed: {
-		...mapState(['hasLogin', 'forcedLogin', 'jyyUser'])
-	},
-	components: {
-		loadMore,
-		backTop,
-		mpvueCityPicker
-	},
-	data() {
-		return {
-			isShow: false,
-			newProducts: [],
-			allSelect: false,
-			bgChange: false,
-			btnStatus: -1, //-1:全部，0：可代理，1：被代理，2:已代理
-			canAgent: false, //可代理按钮状态
-			deleteArr: [], //被取消勾选的产品数组
-			agencyCheckArr: [],
-			cityPickerValueDefault: [0, 0, 1],
-			themeColor: '#007AFF',
-			pickerText: '',
-			amapPlugin: null,
-			amapKey: '408ca849e7fb38410487446db08ec898',
-			addressName: '',
-			backTop: {
-				src: '../../../static/top.png',
-				scrollTop: 0
-			},
-			loadingType: 0,
-			contentText: {
-				contentdown: '上拉显示更多',
-				contentrefresh: '正在加载...',
-				contentnomore: '没有更多数据了'
-			},
-			active: false,
-			isDelShow: false,
-			isFocus: false,
-			sortNavfixed: false,
-			show: false,
-			windowHeight: 0,
-			type: 0,
-			cates: [
-				{
-					css: '',
-					id: '0',
-					no: '000',
-					show: '0',
-					subs: [],
-					title: '全部品牌'
-				}
-			],
-			categorys: [
-				{
-					ico: '../../../static/merchant/all.png',
-					id: '000',
-					no: '000',
-					title: '全部品牌'
-				}
-			],
-			category: {},
-			products: [],
-			curIndex: 0,
-			key: '',
-			id: '000',
-			scrollLeft: 0,
-			scrollY: 0,
-			agentStatus: 1,
-			user: {},
-			newArr: [], //勾选的产品数组(可代理)
-			ordernewArr: [], //勾选的产品数组(已代理)
-			addressId: '',
-			filterCount: 0,
-			filter: [
-				{
-					title: '全部',
-					no: -1,
-					sel: true
-				},
-				{
-					title: '可代理',
-					no: 0,
-					sel: false
-				},
-				{
-					title: '被代理',
-					no: 1,
-					sel: false
-				},
-				{
-					title: '已代理',
-					no: 2,
-					sel: false
-				}
-			],
-			popupType: '',
-			popupContent: '',
-			popupShow: false
-		};
-	},
-	onPageScroll(e) {
-		this.backTop.scrollTop = e.scrollTop;
-		util.loads(this.products, 'list', this.windowHeight);
-		uni.createSelectorQuery()
-			.selectAll('#list')
-			.boundingClientRect(datas => {
-				this.sortNavfixed = parseInt(datas[0].top) < 78 ? true : false;
-			})
-			.exec();
-	},
-	onShow() {},
-	onLoad(e) {
-		this.user = JSON.parse(this.jyyUser);
-		index = 1;
-		this.windowHeight = uni.getSystemInfoSync().windowHeight;
-		this.getCategory();
-		if (e.n > 4) {
-			setTimeout(() => {
-				this.public(e.n, e);
-			}, 200);
-		}
-		// #ifdef MP-WEIXIN
-		this.amapPlugin = new amap.AMapWX({
-			key: this.amapKey
-		});
-		this.getRegeo();
-		// #endif
-
-		// #ifdef H5
-		uni.getLocation({
-			type: 'wgs84',
-			geocode: true,
-			success: res => {
-				let gitude = res.longitude + ',' + res.latitude;
-				let that = this;
-				uni.request({
-					url: 'https://restapi.amap.com/v3/geocode/regeo',
-					method: 'POST',
-					header: {
-						'content-type': 'application/x-www-form-urlencoded'
-					},
-					data: {
-						output: 'JSON',
-						location: gitude,
-						key: 'bf5fad85b6706db59ac208af908aa99e'
-					},
-					success: result => {
-						let addresss = result.data.regeocode.addressComponent;
-						console.log(address);
-						let province = addresss.province;
-						let city = addresss.city;
-						let district = addresss.district;
-						that.addressName = province + '-' + city + '-' + district;
-						that.addressId = address.getAddressid(province, city, district);
-						that.key = that.addressName;
-						that.getData();
-					},
-					fail: () => {},
-					complete: () => {}
-				});
-			}
-		});
-		// #endif
-	},
-	onPullDownRefresh() {
-		this.getData();
-		setTimeout(function() {
-			uni.stopPullDownRefresh();
-		}, 1000);
-	},
-	onReachBottom() {
-		this.getData();
-	},
-	watch: {
-		products(val) {
-			for (let i = 0; i < this.filter.length; i++) {
-				if (this.filter[i].sel) {
-					this.filterProducts(this.filter[i].no);
-				}
-			}
-		}
-	},
-	methods: {
-		...mapMutations(['setAgency']),
-		footerShow(products){
-			if( this.btnStatus == 0){
-				for (let i = 0; i < products.length; i++) {
-					if (products[i].agency == 0) {
-						this.isShow = true;
-						break;
-					} else {
-						this.isShow = false;
-					}
-				}
-			}
-		},
-		getLocation(e, that) {},
-		// 全选
-		AllSelect() {
-			let selected = this.allSelect;
-			this.allSelect = !selected;
-			let arr = this.newProducts;
-			for (let i = 0; i < arr.length; i++) {
-				if (arr[i].agency == 0) {
-					//循环商品为选中
-					if (this.allSelect == true) {
-						this.newProducts[i].select = true;
-					}
-					if (this.allSelect == false) {
-						this.newProducts[i].select = false;
-					}
-				}
-			}
-			this.allSl(); //商品数量
-		},
-		//结算商品数量
-		allSl() {
-			let js = 0;
-			let arr = this.newProducts;
-			for (let i = 0; i < arr.length; i++) {
-				js += this.newProducts[i].select;
-			}
-			this.filterCount = js;
-			if (this.filterCount > 0) {
-				this.bgChange = true;
-			} else {
-				this.bgChange = false;
-			}
-		},
-		filterProducts(no) {
-			for (let i = 0; i < this.products.length; i++) {
-				this.products[i].filter = false;
-			}
-			for (let i = 0; i < this.products.length; i++) {
-				if (no == -1) {
-					this.products[i].filter = true;
-				} else {
-					if (no == this.products[i].agency) {
-						this.products[i].filter = true;
-						this.newProducts = [];
-						for (let j = 0; j < this.products.length; j++) {
-							if (this.products[j].filter) {
-								this.newProducts.push(this.products[j]);
-							}
-						}
-					}
-				}
-			}
-		},
-		filterList(item, key) {
-			for (let i = 0; i < this.filter.length; i++) {
-				if (i == key) {
-					this.$set(item, 'sel', true);
-				} else {
-					this.$set(this.filter[i], 'sel', false);
-				}
-			}
-			this.filterProducts(item.no);
-			this.btnStatus = item.no;
-			this.footerShow(this.products);
-		},
-		//提交申请
-		submit() {
-			let idArr = [];
-			for (let i = 0; i < this.products.length; i++) {
-				if (this.products[i].select === true && this.products[i].agency == 0) {
-					this.agencyCheckArr.push(this.products[i].id);
-				}
-				if (this.products[i].select === false && this.products[i].agency == 0) {
-					idArr.push(this.products[i].id); //存放没勾选的产品id
-				}
-			}
-			let intersection = this.agencyCheckArr.filter(v => idArr.includes(v)); //数组交集
-			let sa = new Set(this.agencyCheckArr);
-			let sb = new Set(intersection);
-			let complement = [...this.agencyCheckArr.filter(x => !sb.has(x)), ...intersection.filter(x => !sa.has(x))]; //数组补集
-			this.agencyCheckArr = complement;
-			setTimeout(() => {
-				let Arr = [];
-				let filterarr = this.agencyCheckArr.filter((value, index) => {
-					//数组去重
-					return this.agencyCheckArr.indexOf(value) === index;
-				});
-				for (let j = 0; j < filterarr.length; j++) {
-					Arr.push({
-						id: filterarr[j]
-					});
-				}
-				this.newArr = Arr;
-				let agencyArr = [];
-				for (let y = 0; y < this.products.length; y++) {
-					for (let z = 0; z < this.newArr.length; z++) {
-						if (this.newArr[z].id == this.products[y].id) {
-							agencyArr.push({
-								title: this.products[y].title,
-								pic: this.products[y].pic,
-								id: this.products[y].id
-							});
-						}
-					}
-				}
-				if (agencyArr.length > 0) {
-					this.setAgency(JSON.stringify(agencyArr));
-					uni.navigateTo({
-						url: 'applyfor?key=' + this.key + '&addressId=' + this.addressId
-					});
-				} else {
-					uni.showToast({
-						title: '请选择代理商品！',
-						icon: 'none'
-					});
-				}
-			}, 500);
-		},
-		Agencychecked(e, index) {
-			switch (e[index].agency) {
-				case 0:
-					e[index].select = !e[index].select;
-					this.$set(this.products[index], 'select', e[index].select);
-					//判断商品是否全部选中，是的话，全选也选中
-					let json = this.newProducts.length;
-					let all = true;
-					for (let i = 0; i < json; i++) {
-						all *= this.newProducts[i].select;
-					}
-					if (all == true) {
-						this.allSelect = true;
-					} else {
-						this.allSelect = false;
-					}
-					this.allSl();
-					break;
-				case 1:
-					uni.showToast({
-						title: '此商品已被代理',
-						icon: 'none'
-					});
-					break;
-				case 2:
-					uni.showToast({
-						title: '此商品我已代理',
-						icon: 'none'
-					});
-					break;
-			}
-		},
-		onConfirm(e) {
-			this.pickerText = e.label;
-			this.key = this.pickerText;
-			this.addressId = e.id;
-		},
-		getRegeo() {
-			uni.showLoading({
-				title: '获取信息中'
-			});
-			this.amapPlugin.getRegeo({
-				success: data => {
-					let province = data[0].regeocodeData.addressComponent.province;
-					let city = data[0].regeocodeData.addressComponent.city;
-					let district = data[0].regeocodeData.addressComponent.district;
-					this.addressName = province + '-' + city + '-' + district;
-					this.addressId = address.getAddressid(province, city, district);
-					this.key = this.addressName;
-					this.getData();
-					uni.hideLoading();
-				}
-			});
-		},
-		showMulLinkageThreePicker() {
-			this.$refs.mpvueCityPicker.show();
-		},
-		focus() {
-			this.active = true;
-			//HM修改 增加获取焦点判断
-			if (this.key != '') {
-				this.isDelShow = true;
-			}
-		},
-		inputChange(event) {
-			var keyword = event.detail.value;
-			this.$emit('input', keyword);
-			if (this.key) {
-				this.isDelShow = true;
-			}
-		},
-		blur() {
-			this.isFocus = false;
-			if (!this.key) {
-				this.active = false;
-			}
-		},
-		clear() {
-			//HM修改 收起键盘
-			uni.hideKeyboard();
-			this.isFocus = false;
-			this.key = '';
-			this.active = false;
-			//HM修改 清空内容时候触发组件input
-			this.isDelShow = false;
-		},
-		search() {
-			index = 1;
-			this.loadingType = 0;
-			this.products = [];
-			this.filterCount = 0;
-			this.allSelect = false;
-			this.getData();
-		},
-		onCancel(e) {
-			//console.log(e)
-		},
-		onReset() {
-			this.pickerText = '';
-			this.key = '';
-		},
-
-		getData() {
-			if (this.loadingType !== 0) {
-				return;
-			}
-			uni.request({
-				url: this.webUrl + 'List',
-				method: 'POST',
-				header: {
-					'content-type': 'application/x-www-form-urlencoded'
-				},
-				data: {
-					pageNum: index,
-					brand: this.id,
-					area: this.key,
-					userid: this.user.id,
-					pageSize: 100,
-					agentStatus: 1,
-					agency: this.user.agency
-				},
-				success: res => {
-					if (res.data.result.ratioProducts.length > 0) {
-						this.products = this.products.concat(res.data.result.ratioProducts);
-						this.footerShow(this.products);
-						setTimeout(() => {
-							util.loads(this.products, 'list', this.windowHeight);
-						}, 500);
-					} else {
-						this.loadingType = 2;
-						return;
-					}
-					if (index == parseInt(res.data.result.pages)) {
-						this.loadingType = 2;
-						return;
-					} else {
-						this.loadingType = 0;
-					}
-					index++;
-				},
-				fail: () => {},
-				complete: () => {}
-			});
-		},
-		getElSize(id) {
-			//得到元素的size
-			return new Promise((res, rej) => {
-				uni.createSelectorQuery()
-					.select('#' + id)
-					.fields(
-						{
-							size: true,
-							scrollOffset: true
-						},
-						data => {
-							res(data);
-						}
-					)
-					.exec();
-			});
-		},
-		async public(i, e) {
-			this.id = e.id;
-			let index = i;
-			let tabBars = await this.getElSize('tab-bars'),
-				tabBarScrollLeft = tabBars.scrollLeft; //点击的时候记录并设置scrollLeft
-			let width = 0;
-			for (let j = 0; j < index; j++) {
-				let result = await this.getElSize('tab' + this.categorys[j].id);
-				width += result.width;
-			}
-			let winWidth = uni.getSystemInfoSync().windowWidth,
-				nowElement = await this.getElSize('tab' + this.categorys[index].id),
-				nowWidth = nowElement.width;
-			if (width + nowWidth - tabBarScrollLeft > winWidth - nowWidth) {
-				this.scrollLeft = width + nowWidth * 3 - winWidth;
-			}
-
-			if (width < tabBarScrollLeft) {
-				this.scrollLeft = width;
-			}
-		},
-		changeTab(i, e) {
-			if (this.curIndex === i) {
-				return false;
-			} else {
-				this.public(i, e);
-				this.isClickChange = true;
-				this.curIndex = i;
-				this.filterCount = 0;
-				this.allSelect = false;
-				this.bgChange = false;
-				index = 1;
-				this.loadingType = 0;
-				this.products = [];
-				this.getData();
-				setTimeout(() => {
-					util.loads(this.products, 'list', this.windowHeight);
-				}, 500);
-			}
-		},
-		imageOnLoad(e) {
-			e.loaded = true;
-		},
-		getCategory() {
-			uni.request({
-				url: this.webUrl + 'Brands',
-				method: 'POST',
-				header: {
-					'content-type': 'application/x-www-form-urlencoded'
-				},
-				success: res => {
-					this.cates = this.cates.concat(res.data.result.brands);
-					this.categorys = this.categorys.concat(res.data.result.brands);
-				},
-				fail: () => {},
-				complete: () => {}
-			});
-		}
-	}
-};
-</script>
-
-<style>
-/*----- 改动的 */
-/* #ifdef H5 */
-.jz_cart .footer {
-	bottom: 0 !important;
-}
-/* #endif */
-.activeBg {
-	background: #dd0101 !important;
-}
-.jz_cart.jz_agent .btn {
-	border-radius: 6rpx;
-	background: #cdcdcd;
-	letter-spacing: 4rpx;
-}
-.jz_agent .common {
-	padding: 0 20upx;
-	background-color: #f1f1f1;
-}
-.jz_agent .selectContent {
-	padding: 0 20upx;
-}
-.jz_agent .selectBtn {
-	position: absolute;
-	right: 0upx;
-	bottom: 0upx;
-}
-.jz_agent .selectBtn image {
-	width: 40upx;
-	height: 40upx;
-}
-.jz_agent .agencyStatus {
-	position: absolute;
-	top: 50%;
-	left: 50%;
-	margin-left: -50upx;
-	margin-top: -50upx;
-	width: 100upx;
-	height: 100upx;
-	background: rgba(0, 0, 0, 0.4);
-	z-index: 888;
-	border-radius: 50%;
-	color: #ffffff;
-}
-
-.jz_agent .loadMore {
-	margin-bottom: 100upx;
-}
-
-.jz_agent .agent-product .agentTop .topItem {
-	position: relative;
-	padding-bottom: 20upx;
-	border-radius: 8upx;
-	box-shadow: 0 0 10rpx 0 #b2b2b2;
-	margin-bottom: 30upx;
-}
-
-.jz_agent .beginCard_btn {
-	position: fixed;
-	left: 0;
-	bottom: 20upx;
-	width: 100%;
-	z-index: 999;
-}
-
-.jz_agent .beginCard_btn button {
-	display: block;
-	width: 550upx;
-	height: 115upx;
-	line-height: 115rpx;
-	font-size: 28rpx;
-	background: url(../../../static/btn.png) no-repeat;
-	background-size: 550upx 115upx;
-	color: #ffffff;
-}
-
-.jz_agent .checkStyle {
-	position: absolute;
-	top: 0upx;
-	left: -16upx;
-	width: 0;
-	height: 0;
-	z-index: 100;
-	border-top: 50upx solid #11c200;
-	border-right: 50upx solid transparent;
-}
-
-.jz_agent .checkStyleActick {
-	position: absolute;
-	top: 0upx;
-	left: -16upx;
-	width: 0;
-	height: 0;
-	z-index: 100;
-	border-top: 50upx solid #ff0000;
-	border-right: 50upx solid transparent;
-}
-
-.jz_agent .topItem {
-	position: relative;
-	z-index: 666;
-	overflow: hidden;
-}
-
-.jz_agent .swiper-tab-list {
-	width: 170upx !important;
-}
-
-.jz_lists scroll-view.uni-swiper-tab {
-	padding-top: 0upx !important;
-}
-
-.jz_myfit.jz_lists scroll-view.uni-swiper-tab {
-	padding-top: 0upx !important;
-	margin-bottom: 0upx !important;
-	padding-bottom: 0upx;
-}
-
-.jz_agent .agencyBtn {
-	color: #09bb07;
-	background: #11c200 !important;
-	padding: 0 10upx;
-}
-
-/* .jz_agent .agent-product {
-		margin-top: 250upx !important;
-	} */
-
-/* ------改动的 */
-
-.jz_agent .agencyTitle.titleSingle {
-	margin: 0 auto;
-	width: 210upx;
-	font-size: 26upx;
-	overflow: hidden;
-	text-overflow: ellipsis;
-	white-space: nowrap;
-	text-align: center;
-}
-
-.jz_agent .topItem-wrap {
-	width: 224upx;
-	height: 224upx;
-	position: relative;
-}
-
-.jz_agent .agencyTitle {
-	width: 224upx;
-	overflow: hidden;
-	white-space: nowrap;
-}
-
-.jz_agent .search-input .icon-del.icon {
-	width: 50upx;
-	top: 0;
-}
-
-.jz_myfit .loadbox {
-	border-top-left-radius: 20upx;
-	border-top-right-radius: 20upx;
-}
-
-.tab-search {
-	position: fixed;
-	width: 100%;
-	z-index: 8888;
-}
-
-.jz_myfit.jz_lists scroll-view.uni-swiper-tab {
-	margin-bottom: 0;
-}
-
-.jz_agent .agent-product {
-	margin-top: 320upx;
-}
-
-.fixed {
-	width: 100%;
-	position: fixed;
-	left: 0;
-	top: 0;
-	/* #ifdef H5 */
-	/* top: 84upx; */
-	top: 44px;
-	/* #endif */
-	background: #ffffff;
-	margin: 0 !import;
-	z-index: 999;
-	box-sizing: border-box;
-	border-bottom: 2upx solid #eeeeee;
-	transform: translateZ(0);
-	-webkit-transform: translateZ(0);
-}
-
-.activeLine {
-	border-bottom: 2upx solid #ff273c;
-}
-
-.jz_lists {
-	position: relative;
-}
-
-.jz_lists scroll-view.uni-swiper-tab {
-	border-bottom: 0;
-	height: auto;
-	line-height: auto;
-	padding-top: 20upx;
-}
-
-.jz_lists .productTitle-item {
-	justify-content: center;
-	align-items: center;
-}
-
-.jz_lists .productTitle-item .picname {
-	line-height: 60upx;
-}
-
-.jz_lists .productTitle-item image {
-	width: 50upx;
-	height: 50upx;
-}
-
-.lists .sortNav .Nav:first-child {
-	/* border-left: none; */
-}
-
-.list .tab-bar-wrap {
-	width: 200upx;
-}
-
-::-webkit-scrollbar {
-	display: none;
-}
-
-.lists .nav-left {
-	width: 218upx;
-	border-right: solid 1upx #e0e0e0;
-	padding-top: 20upx;
-	box-sizing: border-box;
-}
-
-.lists .nav-left .nav-left-title {
-	height: 80upx;
-	font-weight: 600;
-	margin: 0 auto;
-	margin-left: 10upx;
-}
-
-.lists .nav-left-item {
-	height: 110upx;
-	font-size: 30upx;
-	display: flex;
-	align-items: center;
-	justify-content: center;
-}
-
-.lists .nav-left-item image {
-	width: 40upx;
-	height: 40upx;
-	margin-right: 18upx;
-}
-
-.lists .nav-right {
-	width: 100%;
-	box-sizing: border-box;
-}
-
-.uni-tab-bar-loading {
-	width: 100%;
-}
-
-.uni-tab-bar-loading .loading-text {
-	margin-top: 50upx;
-	font-size: 28upx;
-	text-align: center;
-}
-
-.lists .list {
-	width: 100%;
-	height: 92%;
-}
-
-#tab-bar {
-	background-color: #ffffff;
-	padding-bottom: 60upx;
-	overflow: hidden;
-}
-
-.uni-tab-bar .active {
-	color: #ffe200;
-	/* border-left: 10upx solid #ffe200; */
-}
-
-.prices .prices-cart image {
-	width: 52upx;
-	height: 50upx;
-	margin-right: 10upx;
-}
-
-.prices .prices-salePrice {
-	font-size: 22upx;
-	color: #f00000;
-}
-
-.image {
-	position: absolute;
-	width: 100%;
-	height: 100%;
-}
-
-.placeholder {
-	background: #e2e2e2 url(../../../static/load.gif) center center no-repeat;
-	opacity: 1;
-	transition: opacity 0.4s linear;
-}
-
-.placeholder.loaded {
-	opacity: 0;
-}
-
-.list-collapse {
-	padding-left: 36upx;
-	box-sizing: border-box;
-}
-
-.lists .sortNav .navActive {
-	color: #d80000;
-}
-
-.uni-filter {
-	margin-top: 8upx;
-	background-color: #ffffff;
-	padding: 16upx 24upx;
-	font-size: 28upx;
-	justify-content: space-between;
-	position: relative;
-}
-
-.uni-filter .uni-filter-item {
-	background-color: #f1f1f1;
-	padding: 8upx 0;
-	border-radius: 4upx;
-	width: 24%;
-	height: 32upx;
-	justify-content: center;
-	align-items: center;
-	position: relative;
-}
-
-.uni-filter .uni-filter-sel {
-	background-color: #c50200;
-	color: #ffffff;
-}
-
-/* .uni-filter .uni-filter-line {
-	position: absolute;
-	height: 4upx;
-	background: #f1f1f1;
-	top: 50%;
-	left: 0;
-	margin-top: -2upx;
-	width: 100%;
-} */
-
-.jz_agent .search {
-	margin-top: 8upx;
-}
-</style>

pages/user/agent/product.vue

@@ -1,207 +0,0 @@
-<template>
-	<view class="jz_agentProduct">
-		<view class="agentProduct-bg"><image src="../../../static/product10.png"></image></view>
-		<view class="productcontent uni-flex uni-column ">
-			<view class="uni-flex content-top align-items">
-				<view class="img uni-flex justify-align-center" @click="goMerchProduct"><image :src="product.pic"></image></view>
-				<view class="messages uni-flex uni-column">
-					<view class="product-title">{{ product.title }}</view>
-					<view class="uni-flex">
-						<view class="salePrice">￥{{ product.salePrice }}</view>
-						<view class="marketPrice">￥{{ product.marketPrice }}</view>
-					</view>
-				</view>
-			</view>
-			<view class="uni-flex-item content-bottom align-items uni-flex">
-				<view class="area">地区</view>
-				<input :value="pickerText" class="uni-flex-item" disabled name="area" placeholder="选择地区" @click="showMulLinkageThreePicker" />
-				<view class="search uni-flex justify-align-center" @click="search">
-					<image src="../../../static/search02.png"></image>
-					<view class="btnTitle">搜索</view>
-				</view>
-			</view>
-		</view>
-		<view class="agentMessage uni-flex uni-column ">
-			<view class="messageItem uni-flex align-items itemTitle">代理信息</view>
-			<view class="messageItem uni-flex align-items" v-for="(item, index) in areaArr" :key="index" v-if="areaArr.length > 0">
-				<view class="circle"></view>
-				<view class="">{{ item.areaStr }}</view>
-			</view>
-			<view class="messageItem uni-flex align-items noMessage space-between" v-if="key == '' && areaArr.length == 0"><view class="uni-flex">暂无</view></view>
-			<view class="messageItem uni-flex align-items noMessage space-between" v-if="key != '' && areaArr.length == 0">
-				<view class="uni-flex">当前区域可申请代理</view>
-				<view class="agencyBtn uni-flex justify-align-center" @click="goAgency">点击申请</view>
-			</view>
-		</view>
-		<mpvue-city-picker
-			:themeColor="themeColor"
-			ref="mpvueCityPicker"
-			:pickerValueDefault="cityPickerValueDefault"
-			@onCancel="onCancel"
-			@onConfirm="onConfirm"
-			@onReset="onReset"
-		></mpvue-city-picker>
-	</view>
-</template>
-
-<script>
-import { mapState, mapMutations } from 'vuex';
-import mpvueCityPicker from '@/components/mpvue-citypicker/mpvueCityPicker.vue';
-export default {
-	computed: {
-		...mapState(['hasLogin', 'forcedLogin', 'jyyUser'])
-	},
-	data() {
-		return {
-			key: '',
-			id: 0,
-			product: {
-				title: '',
-				salePrice: '',
-				marketPrice: ''
-			},
-			areaArr: [],
-			cityPickerValueDefault: [0, 0, 1],
-			themeColor: '#007AFF',
-			pickerText: '',
-			address: {},
-			agency: {}
-		};
-	},
-	components: {
-		mpvueCityPicker
-	},
-	onBackPress() {
-		if (this.$refs.mpvueCityPicker.showPicker) {
-			this.$refs.mpvueCityPicker.pickerCancel();
-			return true;
-		}
-	},
-	onUnload() {
-		if (this.$refs.mpvueCityPicker.showPicker) {
-			this.$refs.mpvueCityPicker.pickerCancel();
-		}
-	},
-
-	onLoad(e) {
-		this.id = e.id;
-		this.init();
-	},
-	methods: {
-		goAgency() {
-			let agent = {};
-			agent = this.agency;
-			agent.productId = this.id;
-			agent.productTitle = this.product.title;
-			agent.productPic = this.product.pic;
-			agent.address = this.key;
-			uni.navigateTo({
-				url: 'applyfor?agency=' + encodeURIComponent(JSON.stringify(agent))
-			});
-		},
-		goMerchProduct() {
-			uni.navigateTo({
-				url: '../../merchant/product/product?id=' + this.id
-			});
-		},
-		showMulLinkageThreePicker() {
-			this.$refs.mpvueCityPicker.show();
-		},
-		onCancel(e) {
-			//console.log(e)
-		},
-		onReset() {
-			this.pickerText = '';
-		},
-		onConfirm(e) {
-			this.agency = e;
-			this.pickerText = e.label;
-			this.address.province = e.value[0];
-			this.address.city = e.value[1];
-			this.address.district = e.value[2];
-			this.address.siteStr = e.label;
-		},
-		init() {
-			this.getData();
-			this.getAgentArea();
-		},
-		search() {
-			this.key = this.pickerText;
-			this.getAgentArea();
-		},
-		getData() {
-			uni.showLoading({
-				title: '加载中'
-			});
-			uni.request({
-				url: this.webUrl + 'Product',
-				method: 'POST',
-				data: {
-					id: this.id,
-					key: this.key
-				},
-				header: {
-					'content-type': 'application/x-www-form-urlencoded'
-				},
-				success: res => {
-					uni.hideLoading();
-					if (res.data.result.isSuccess) {
-						this.product = res.data.result.product;
-					} else {
-						uni.showModal({
-							title: '系统提示',
-							content: res.data.result.resultInfo
-						});
-					}
-				},
-				fail: () => {},
-				complete: () => {}
-			});
-		},
-		getAgentArea() {
-			uni.showLoading({
-				title: '加载中'
-			});
-			uni.request({
-				url: this.webUrl + 'ProductAgency',
-				method: 'POST',
-				data: {
-					id: this.id,
-					key: this.pickerText
-				},
-				header: {
-					'content-type': 'application/x-www-form-urlencoded'
-				},
-				success: res => {
-					uni.hideLoading();
-					this.areaArr = res.data.data;
-				},
-				fail: () => {},
-				complete: () => {}
-			});
-		}
-	}
-};
-</script>
-
-<style>
-.content {
-	text-align: center;
-	height: 400upx;
-}
-
-.logo {
-	height: 200upx;
-	width: 200upx;
-	margin-top: 200upx;
-}
-
-.title {
-	font-size: 36upx;
-	color: #8f8f94;
-}
-
-.jz_agentProduct .agencyBtn {
-	border-radius: 8upx;
-}
-</style>

pages/user/beginCard/beginCard.vue

@@ -1,126 +0,0 @@
-<template>
-	<view class="jz_beginCard uni-flex uni-column">
-		<view class="beginCardImg">
-			<image src="https://www.jinzun99.com/static/01.png"></image>
-		</view>
-		<form class="uni-flex uni-flex-item uni-column form" @submit="formSubmit" @reset="formReset">
-			<view class="uni-flex-item justify-align-center uni-flex uni-column">
-				<view class="beginCard_name uni-flex align-items">
-					<view class="uni-flex-item">真实姓名：</view>
-					<input type="text"  class="uni-flex-item3" v-model="nickName" name="nickName" placeholder="请填写姓名"  placeholder-style="font-size: 24upx;"/>
-				</view>
-				<view class="beginCard_name uni-flex align-items">
-					<view class="uni-flex-item">手机号码：</view>
-					<input type="text"  class="uni-flex-item3" v-model="mobile" name="mobile" placeholder="请填写手机号码"   placeholder-style="font-size: 24upx;"/>
-				</view>
-				<view class="beginCard_btn">
-					<button formType="submit" class="uni-flex justify-align-center">
-						提交申请
-					</button>
-				</view>
-				<view class="uni-flex align-items beginCard-phone">
-					<image src="../../../static/beginCard/03.png"></image>
-					官方联系电话
-				</view>
-				<view class="uni-flex align-items phone">
-					400-888-6666
-				</view>
-			</view>
-		</form>
-	</view>
-</template>
-
-<script>
-	var graceChecker = require('../../../common/graceChecker.js');
-	
-	import {
-		mapState,
-		mapMutations
-	} from 'vuex';
-
-	export default {
-		data() {
-			return {
-				nickName: '',
-				mobile: '',
-				user: {}
-			}
-		},
-		computed: {
-			...mapState(['hasLogin', 'jyyUser'])
-		},
-		onLoad() {
-			if (!this.hasLogin) {
-				uni.navigateTo({
-					url: '../login/login'
-				});
-			} else {
-				this.user = JSON.parse(this.jyyUser);
-				this.nickName=this.user.nickName;
-				this.mobile=this.user.mobile;
-			}
-		},
-		methods: {
-			formSubmit: function(e) {
-
-				var rule = [{
-						name: 'nickName',
-						checkType: 'notnull',
-						checkRule: '1,4',
-						errorMsg: '请填写姓名'
-					},
-					{
-						name: 'mobile',
-						checkType: 'string',
-						checkRule: '11',
-						errorMsg: '手机号码11个字符'
-					}
-
-				];
-				//进行表单检查
-				var formData = e.detail.value;
-				var checkRes = graceChecker.check(formData, rule);
-				if (checkRes) {
-					uni.request({
-						url: this.webUrl + 'OpenBrand',
-						method: 'POST',
-						data: {
-							nickName: this.nickName,
-							mobile: this.mobile
-						},
-						header: {
-							'content-type': 'application/x-www-form-urlencoded'
-						},
-						success: res => {
-							uni.hideLoading();
-							uni.showToast({
-								title: res.data.result.resultInfo,
-								icon: 'none'
-							});
-						},
-						fail: () => {},
-						complete: () => {}
-					});
-				} else {
-					uni.showToast({
-						title: graceChecker.error,
-						icon: 'none'
-					});
-				}
-			},
-		}
-	}
-</script>
-
-<style>
-	.jz_beginCard .beginCard_btn button{
-		display: block;
-		width: 550upx;
-		height: 115upx;
-		line-height: 115upx;
-		font-size: 28upx;
-		color: #FFFFFF;
-		background: url(../../../static/btn.png) no-repeat;
-		background-size: 550upx 115upx;
-	}
-</style>

pages/user/cart/cart.vue

@@ -1,822 +0,0 @@
-<template>
-	<view class="uni-flex uni-column  cart jz_cart jz_merchant">
-		<view class="uni-flex uni-column" v-if="!ok">
-			<view class="uni-flex cart-empty">
-				<view class="uni-flex uni-column">
-					<view class="uni-flex justify-align-center">
-						<image src="../../../static/cart/cartempty.png" mode="widthFix"></image>
-					</view>
-					<view class="uni-flex justify-align-center cart-empty-title">购物车空空如也~</view>
-					<view class="uni-flex justify-align-center cart-empty-title" @click="goMyAgency" style="margin-top: 12upx; font-size: 28upx; background-color: #CA0000;border-radius: 8upx; color: #FFFFFF;">
-						代理商品一键下单<image src="../../../static/cart/arrow1.png" mode="widthFix" style="margin-left: 4upx; height: 24upx; width: 24upx;"></image>
-					</view>
-				</view>
-			</view>
-			<!-- <recommend :items="items" :src="src"></recommend> -->
-			<view class="recommend uni-flex uni-column">
-				<view class="push_product_title uni-flex justify-align-center">
-					<image :src="src"></image>
-					<view class="push_title">为你推荐</view>
-				</view>
-				<view class="uni-flex lists-wrap">
-					<view class="uni-flex uni-row list">
-						<view class="uni-product-list" id="list">
-							<view class="uni-product" v-for="(item, key) in items" :key="key" @click="goProduct(item.id)">
-								<view class="image-view uni-flex justify-align-center">
-									<!-- <image :src="item.pic"></image> -->
-									<image class="image" :class="{lazy:!item.display}" :id="'lazy'+ key" :data-index="0" @load="imageOnLoad(item)"
-									 :src="item.display?item.pic:''" />
-									<view class="loadbox" :class="{loaded:item.loaded}">
-										<view class="load"></view>
-									</view>
-								</view>
-								<view class="uni-flex uni-column uni-product-title-wrap">
-									<view class="uni-product-title uni-flex-item">{{ item.title }}</view>
-									<view class="product_details uni-flex uni-row">
-										{{item.profile}}
-									</view>
-									<view class="uni-flex-item prices uni-flex">
-										<view class="prices-salePrice">￥{{ item.salePrice }}</view>
-										<view class="prices-cart">
-											<image src="../../../static/category/cart.png"></image>
-										</view>
-									</view>
-								</view>
-							</view>
-						</view>
-					</view>
-				</view>
-			</view>
-
-
-
-		</view>
-
-		<view class="uni-flex" v-if="ok">
-			<view class="uni-flex uni-column uni-flex-item cart-list">
-				<!-- 列表循环 -->
-				<view class="uni-flex uni-row " v-for="(item, m) in json" :key="m" v-if="item.show">
-					<view class="uni-flex uni-column item-shop uni-flex-item">
-						<!-- 商家 -->
-						<!-- <view class="uni-flex uni-row  item-shop-name">
-							<view class="uni-flex item-sel">
-								<view :class="[yuan,{bg:item.select}]" @click.stop="dpSelected(m)"></view>
-							</view>
-							<view class="uni-flex dp">{{item.sj}}</view>
-						</view> -->
-						<!-- 图片产品名称价格数量展示 -->
-						<view class="uni-flex uni-row cart-item" v-for="(pl, index) in json[m].items" :key="index" v-if="pl.show">
-							<!-- 选择按钮 -->
-							<view class="uni-flex item-sel">
-								<view :class="[yuan, { bg: pl.select }]" @click="selected(m, index, $event)"><text v-if="pl.select" class="gou"></text></view>
-							</view>
-							<!-- 商品图片 -->
-							<view class="uni-flex uni-flex-item cart-item-left">
-								<view class="uni-flex uni-flex-item item-padding item-img" @click="goProduct(pl.id)">
-									<image mode="widthFix" :src="pl.img"></image>
-								</view>
-								<view class="uni-flex uni-column uni-flex-item2 item-padding">
-									<view class="uni-flex uni-flex-item title">{{ pl.cp }}</view>
-
-									<view class="uni-flex uni-row cart-attr" @click="changeAttr(m,index)">
-										<view class="uni-flex  uni-row" style="background-color: #F2F2F2;padding: 8upx;height: 40upx;overflow: hidden; border-radius: 8upx;">
-											<view class="uni-flex" v-for="(attr,n) in pl.attr" :key="n">
-												<text v-if="(n+1<pl.attr.length)" class="text">{{attr.value}};</text>
-												<text v-if="(n+1==pl.attr.length)" class="text">{{attr.value}}</text>
-											</view>
-											<view class="uni-flex" style=" margin-left: 4upx; width: 30upx;align-items: center;justify-content: center;">
-												<image src="../../../static/cart/arrow.png" mode="widthFix"></image>
-											</view>
-										</view>
-									</view>
-
-									<view class="uni-flex uni-row uni-flex-item">
-										<view class="uni-flex uni-flex-item3 cartpriceBg">￥{{ pl.jg }}</view>
-										<view class="uni-flex uni-row numbers uni-flex-item2">
-											<view class="uni-flex number" @click="reduce(m, index)">-</view>
-											<input class="uni-flex" disabled="disabled" type="text" v-model="pl.sl" />
-											<view class="uni-flex number" @click="add(m, index)">+</view>
-										</view>
-									</view>
-								</view>
-							</view>
-						</view>
-					</view>
-				</view>
-			</view>
-			<view class="uni-flex uni-row header">
-				<view class="uni-flex uni-flex-item">
-					<view class="uni-flex uni-flex-item5">共{{ all }}件宝贝</view>
-					<view v-show="open" class="uni-flex manage uni-flex-item" @click="manage()">管理</view>
-					<view v-show="!open" class="uni-flex manage uni-flex-item" @click="manage()">完成</view>
-				</view>
-			</view>
-			<view class="uni-flex uni-row footer">
-				<view class="uni-flex uni-flex-item ">
-					<view class="uni-flex item-sel ">
-						<view :class="[yuan, { bg: allSelect }]" @click="AllSelect()"><text v-if="allSelect" class="gou"></text></view>
-					</view>
-					<view class="uni-flex uni-flex-item itemAll">全选</view>
-					<view class="uni-flex uni-flex-item3">￥{{ allPrice }}</view>
-					<view class="uni-flex uni-flex-item2 justify-align-center">
-						<view v-show="open" class="uni-flex uni-flex-item btn" @click="js()" :class="{'activeBg':bgChange}">结算({{ allNum }})</view>
-						<view v-show="!open" class="uni-flex uni-flex-item btn-hollow" :class="{'activeDel':delBgChange}" @click="delAll()">删除({{ allNum }})</view>
-					</view>
-				</view>
-			</view>
-		</view>
-		<attr-popup :show="showAttr" @hidePopup="hidePopup" :productItems="productItems" :toptitle="toptitle"></attr-popup>
-		<backTop :src="backTop.src" :scrollTop="backTop.scrollTop"></backTop>
-		<attr :show="showAttr1" ref="child1" :popStock="stock" :staticStock="stock" :user="user" :saleMode="saleMode" :max="max"
-		 :weight="weight" :mode="mode" :merchant="merchant" :expressFees="expressFees" :number="stock" :popUnitNum="unitNum"
-		 :unit="unit" :popIndex="popIndex" :title="title" :pic="pic" :sale="sale" :popMarketPrice="marketPrice" :popSalePrice="salePrice"
-		 :pid="id" :hideAttr="hideAttr" :attr="attr" :popupAttr="popupAttr" :popCarts="json" @selAttrPic="selAttrPic"
-		 @ModiAttr="ModiAttr" @hidePopup1="hidePopup1"></attr>
-	</view>
-</template>
-
-<script>
-	import {
-		mapState,
-		mapMutations
-	} from 'vuex';
-
-	import attrPopup from '../../../components/cartcommon/uni-popup-public.vue';
-	import cart from '../../../common/cart.js';
-	import util from '../../../common/util.js';
-	import attr from '../../../components/uni-popup-attr.vue';
-	import backTop from '@/components/uni-top.vue';
-
-	export default {
-		computed: {
-			...mapState(['hasLogin', 'forcedLogin', 'jyyUser'])
-		},
-		data() {
-			return {
-				backTop: {
-					src: '../../../static/top.png',
-					scrollTop: 0
-				},
-				delBgChange: false,
-				bgChange: false,
-				src: '../../../static/pay04.png',
-				yuan: 'yuan',
-				allPrice: '0.00',
-				allSelect: false,
-				Show: -1,
-				open: true,
-				ok: false,
-				allNum: 0,
-				all: 0,
-				json: [],
-				user: {},
-				items: [],
-				showAttr: false,
-				productItems: [],
-				toptitle: '',
-				windowHeight: 0,
-				//attr
-				product: {},
-				showAttr1: false,
-				stock: 0,
-				saleMode: 0,
-				mode: '',
-				max: '',
-				unit: '',
-				unitNum: 1,
-				weight: '',
-				merchant: {},
-				expressFees: [],
-				title: '',
-				pic: '',
-				sale: {
-					mode: '0'
-				},
-				salePrice: '',
-				marketPrice: '',
-				id: '',
-				hideAttr: true,
-				attr: [],
-				popupAttr: {},
-				attrPic: {},
-				popIndex: 0,
-				//attr
-			};
-		},
-		onShow() {
-			this.init();
-		},
-		onLoad(e) {
-			this.windowHeight = uni.getSystemInfoSync().windowHeight;
-			this.init();
-		},
-		onPageScroll(e) {
-			this.backTop.scrollTop = e.scrollTop;
-			util.loads(this.items, 'list', this.windowHeight);
-		},
-		onPullDownRefresh() {
-			this.init();
-			setTimeout(function() {
-				uni.stopPullDownRefresh();
-			}, 1000);
-		},
-		components: {
-			attrPopup,
-			attr,
-			backTop
-		},
-		methods: {
-			goMyAgency() {
-				uni.navigateTo({
-					url: '../myAgency/index'
-				})
-			},
-			selAttrPic(e) {
-				if (this.attrPic) {
-					for (let i = 0; i < this.attrPic.length; i++) {
-						if (this.attrPic[i].name == e) {
-							this.pic = this.domain + this.attrPic[i].url;
-							break;
-						}
-					}
-				}
-			},
-			ModiAttr(js) {
-				this.hidePopup1();
-				this.json = this.cartSort(js);;
-				cart.updateCart(this.json);
-			},
-			cartSort(json) {
-				for (let i = 0; i < json.length; i++) {
-					json[i].items.sort(function(a, b) {
-						return a.id - b.id
-					});
-				}
-				return json;
-			},
-			hidePopup1() {
-				this.showAttr1 = false;
-			},
-			changeAttr(m, index) {
-				this.id = this.json[m].items[index].id;
-				this.getProduct();
-				this.popIndex = index;
-			},
-			getProduct() {
-				uni.showLoading({
-					title: '加载中'
-				});
-				uni.request({
-					url: this.webUrl + 'Product',
-					method: 'POST',
-					data: {
-						id: this.id,
-						userid: this.userid
-					},
-					header: {
-						'content-type': 'application/x-www-form-urlencoded'
-					},
-					success: res => {
-						uni.hideLoading();
-						if (res.data.result.isSuccess) {
-							this.product = res.data.result.product;
-							this.saleMode = this.product.saleMode;
-							this.salePrice = this.product.salePrice.toFixed(2);
-							this.marketPrice = this.product.marketPrice.toFixed(2);
-							this.stock = this.product.stock;
-							this.max = this.product.stock;
-							this.pic = this.product.pic;
-							this.unitNum = this.product.unitNum;
-							this.unit = this.product.unit;
-							this.title = this.product.title;
-							this.merchant = res.data.result.merchant;
-							this.expressFees = res.data.result.expressFees;
-							this.weight = this.product.weight;
-							if (this.product.attributeList != null) {
-								let jsonAttr = JSON.parse(this.product.attributeList);
-								this.popupAttr = jsonAttr;
-								this.attr = [];
-								for (let i = 0; i < this.popupAttr.length; i++) {
-									this.attr.push(JSON.parse('{"name":"' + this.popupAttr[i].attrName + '","value":""}'));
-								}
-							}
-							this.sale.mode = 0;
-							this.max = this.stock;
-							this.showAttr1 = true;
-							this.mode = 3;
-							this.$refs.child1.groupCartInit();
-						} else {
-							uni.showModal({
-								title: '系统提示',
-								content: res.data.result.resultInfo
-							});
-						}
-					},
-					fail: () => {},
-					complete: () => {}
-				});
-			},
-			goProduct(id) {
-				uni.navigateTo({
-					url: '../../merchant/product/product?id=' + id
-				})
-			},
-			init() {
-				if (!this.hasLogin) {
-					uni.navigateTo({
-						url: '../login/login'
-					});
-				} else {
-					uni.showLoading({
-						title: "加载中"
-					})
-					this.delBgChange = false;
-					this.bgChange = false;
-					this.user = JSON.parse(this.jyyUser);
-					this.json = this.cartSort(cart.getCart());
-					console.log(this.json)
-					this.userid = this.user.id;
-					if (this.json.length > 0) {
-						this.ok = true;
-						this.reSetSel();
-						this.count();
-					} else {
-						this.getDate();
-						this.ok = false;
-					}
-					uni.hideLoading();
-				}
-			},
-			hidePopup() {
-				this.showAttr = false;
-			},
-			manage() {
-				this.open = !this.open;
-			},
-			getDate() {
-				uni.request({
-					url: this.webUrl + 'Recommend',
-					method: 'POST',
-					data: {
-						userid: this.userid
-					},
-					header: {
-						'content-type': 'application/x-www-form-urlencoded'
-					},
-					success: res => {
-						this.items = res.data.result.resultInfo;
-						setTimeout(() => {
-							util.loads(this.items, 'list', this.windowHeight);
-						}, 300)
-					},
-					fail: () => {},
-					complete: () => {}
-				});
-			},
-			imageOnLoad(e) {
-				e.loaded = true;
-			},
-			selected(m, index) {
-				let select = this.json[m].items[index].select;
-				this.json[m].items[index].select = !select;
-				//this.cpIndex = index;
-				let length = this.json[m].items.length;
-
-				//商品全部选中，店铺才选中
-				let select1 = true;
-				for (let i = 0; i < length; i++) {
-					//叠加积累有false就为false
-					select1 *= this.json[m].items[i].select;
-				}
-				if (select1 == true) {
-					this.json[m].select = true;
-				} else {
-					this.json[m].select = false;
-				}
-
-				//判断商品是否全部选中，是的话，全选也选中
-				let json = this.json.length;
-				let all = true;
-				for (let i = 0; i < json; i++) {
-					all *= this.json[i].select;
-				}
-				if (all == true) {
-					this.allSelect = true;
-				}
-				this.allSl(); //商品数量
-				this.cancel(m, index); //商品没有全部选中就取消全选
-				this.price(); //总价
-			},
-			//结算商品数量
-			allSl() {
-				let json = this.json.length;
-				let js = 0;
-				for (let i = 0; i < json; i++) {
-					let arr = this.json[i].items;
-					for (let j = 0; j < arr.length; j++) {
-						if (this.json[i].items[j].show) {
-							js += this.json[i].items[j].select;
-						}
-					}
-				}
-				this.allNum = js;
-				if (this.allNum > 0) {
-					this.bgChange = true;
-				} else {
-					this.bgChange = false;
-				}
-			},
-			count() {
-				let json = this.json.length;
-				let js = 0;
-				for (let i = 0; i < json; i++) {
-					let arr = this.json[i].items;
-					for (let j = 0; j < arr.length; j++) {
-						js++;
-					}
-				}
-				this.all = js;
-			},
-			//计算价格
-			price() {
-				let all = 0;
-				for (let j = 0; j < this.json.length; j++) {
-					//点击循环有多少个商家
-					let arr = this.json[j].items; //获取商家下面的列表产品
-					for (let i = 0; i < arr.length; i++) {
-						//循环产品列表
-						if (arr[i].select === true) {
-							//列表里面那些为true
-							all += arr[i].jg * arr[i].sl; //为true的价格加起来，为总价
-						}
-					}
-				}
-				this.allPrice = all.toFixed(2); //返回数据
-				if (this.allPrice > 0) {
-					this.delBgChange = true;
-				} else {
-					this.delBgChange = false;
-				}
-			},
-			//选择属于某个商家地所有产品
-			dpSelected(index) {
-				//商家选中
-				let select = this.json[index].select;
-				this.json[index].select = !select;
-
-				let arr = this.json[index].items; //获取店铺下面的产品数量
-				for (let i = 0; i < arr.length; i++) {
-					//循环产品数量
-					if (arr[i].select == false) {
-						//判断有那些产品未选中
-						arr[i].select = true; //选中咯
-					}
-					if (this.json[index].select === false) {
-						//当店铺取消全选的时候
-						arr[i].select = false; //产品全部没选中
-					}
-				}
-				let select1 = true; //创建一个为真的变量
-				for (let i = 0; i < this.json.length; i++) {
-					if (this.json[i].select == false) {
-						//如果有商家没选中全选则为false
-						this.allSelect = false;
-					}
-					select1 *= this.json[i].select;
-				}
-
-				if (select1 == true) {
-					this.allSelect = true;
-				}
-
-				this.allSl(); //商品数量
-				this.price();
-			},
-			AllSelect() {
-				let selected = this.allSelect;
-				this.allSelect = !selected;
-
-				let dp = this.json.length; //获取店铺数量
-				for (let i = 0; i < dp; i++) {
-					//循环店铺
-					let arr = this.json[i].items; //获取每个店铺的商品
-					for (let j = 0; j < arr.length; j++) {
-						//循环每个店铺里面的商品为选中
-						if (this.json[i].items[j].show) {
-							if (this.allSelect == true) {
-								this.json[i].items[j].select = true;
-							}
-							if (this.allSelect == false) {
-								this.json[i].items[j].select = false;
-							}
-						}
-					}
-					if (this.json[i].show) {
-						if (this.allSelect == true) {
-							this.json[i].select = true;
-						} else {
-							this.json[i].select = false;
-						}
-					}
-				}
-				this.allSl(); //商品数量
-				this.price();
-			},
-			//商品没有全部选中就取消全选
-			cancel(m, index) {
-				if (this.json[m].items[index].select == false) {
-					this.allSelect = false;
-				}
-			},
-			//商品--
-			reduce(m, index) {
-				if (this.json[m].items[index].sl <= 1) {
-					return;
-				}
-				this.json[m].items[index].sl--;
-				this.price();
-				cart.updateCart(this.json);
-			},
-			//商品++
-			add(m, index) {
-				this.json[m].items[index].sl++;
-				let id = this.json[m].items[index].id;
-				let attrMode = this.json[m].items[index].attrMode;
-				let count = 0;
-				let stock = 0;
-				if (attrMode) {
-					for (let j = 0; j < this.json[m].items.length; j++) {
-						if (this.json[m].items[j].attrMode == true & this.json[m].items[j].id == id) {
-							count += this.json[m].items[j].unitNum * this.json[m].items[j].sl;
-						}
-					}
-					stock = this.json[m].items[index].stock;
-				} else {
-					count = this.json[m].items[index].sl * this.json[m].items[index].unitNum;
-					stock = this.json[m].items[index].attrStock;
-				}
-				if (count >= stock) {
-					uni.showToast({
-						title: '库存不足',
-						icon: 'none'
-					});
-					this.json[m].items[index].sl--;
-				} else {
-					// this.json[m].items[index].jg = (this.json[m].items[index].sl * this.json[m].items[index].unitNum * this.json[m].items[
-					// 	index].unitPrice).toFixed(2);
-					this.price();
-					cart.updateCart(this.json);
-				}
-
-
-			},
-			delAll() {
-				if (this.delBgChange) {
-					const jsons = [];
-					let f = false;
-					for (let j = 0; j < this.json.length; j++) {
-						let arr = this.json[j].items;
-						let items = [];
-						for (let i = 0; i < arr.length; i++) {
-							if (arr[i].select === false) {
-								items.push({
-									id: arr[i].id,
-									cp: arr[i].cp,
-									jg: arr[i].jg,
-									img: arr[i].img,
-									sl: arr[i].sl,
-									attr: arr[i].attr,
-									unitNum: arr[i].unitNum,
-									unit: arr[i].unit,
-									attrMode: arr[i].attrMode,
-									select: false,
-									show: true,
-									weight: arr[i].weight,
-									expressFees: arr[i].expressFees
-								});
-							} else {
-								f = true;
-							}
-						}
-						if (items.length > 0) {
-							const item = {
-								mid: this.json[j].mid,
-								sj: this.json[j].sj,
-								no: '',
-								totalPrice: '',
-								select: false,
-								show: true,
-								message: '',
-								expressCost: '',
-								items: items,
-								count: '',
-								sale: this.json[j].sale
-							};
-							jsons.push(item);
-							this.allPrice = '0.00';
-							this.allNum = 0;
-						}
-					}
-					if (!f) {
-						uni.showToast({
-							icon: 'none',
-							title: '请选择商品'
-						});
-					} else {
-						let that = this;
-						uni.showModal({
-							title: '提示',
-							content: '是否删除',
-							success: function(res) {
-								if (res.confirm) {
-									that.json = jsons;
-									cart.updateCart(that.json);
-									if (jsons.length == 0) {
-										that.ok = false;
-										that.init()
-									}
-									that.allPrice = '0.00';
-									that.allNum = 0;
-									that.delBgChange = false;
-									that.bgChange = false;
-								} else if (res.cancel) {
-									console.log('用户点击取消');
-								}
-							}
-						});
-
-					}
-				}
-			},
-			reSetSel() {
-				for (var i = 0; i < this.json.length; i++) {
-					this.json[i].select = false;
-					for (var j = 0; j < this.json[i].items.length; j++) {
-						this.json[i].items[j].select = false;
-					}
-				}
-				this.allSelect = false;
-				this.allPrice = '0.00';
-				this.allNum = 0;
-				this.open = true;
-			},
-			//结算支付
-			js() {
-				if (this.bgChange) {
-					if (this.allPrice == 0) {
-						uni.showToast({
-							icon: 'none',
-							title: '请选择商品'
-						});
-					} else {
-						const jsons = [];
-						let f = false;
-						for (let j = 0; j < this.json.length; j++) {
-							let arr = this.json[j].items;
-							let items = [];
-							for (let i = 0; i < arr.length; i++) {
-								if (arr[i].select === true) {
-									items.push({
-										id: arr[i].id,
-										cp: arr[i].cp,
-										jg: arr[i].jg,
-										img: arr[i].img,
-										sl: arr[i].sl,
-										attr: arr[i].attr,
-										unitNum: arr[i].unitNum,
-										weight: arr[i].weight,
-										unit: arr[i].unit,
-										attrMode: arr[i].attrMode
-									});
-								} else {
-									f = true;
-								}
-							}
-							if (items.length > 0) {
-								const item = {
-									mid: this.json[j].mid,
-									sj: this.json[j].sj,
-									no: '',
-									totalPrice: '',
-									message: '',
-									expressCost: '',
-									items: items,
-									count: '',
-									sale: this.json[j].sale
-								};
-								jsons.push(item);
-							}
-						}
-
-						uni.showLoading({
-							title: '订单保存中'
-						});
-						uni.request({
-							url: this.webUrl + 'SaveOrder',
-							method: 'POST',
-							data: {
-								user: JSON.stringify(this.user),
-								data: JSON.stringify(jsons)
-							},
-							header: {
-								'content-type': 'application/x-www-form-urlencoded'
-							},
-							success: res => {
-								uni.hideLoading();
-								if (res.data.result.isSuccess) {
-									cart.setOrder(res.data.orders);
-									//cart.updateCart([]);
-									uni.navigateTo({
-										url: '../order/order'
-									});
-								} else {
-									this.showAttr = true;
-									this.toptitle = res.data.result.resultInfo;
-									this.productItems = res.data.result.resultInfo2;
-									// uni.showToast({
-									// 	title: res.data.result.resultInfo,
-									// 	icon: 'none'
-									// });
-								}
-							},
-							fail: () => {},
-							complete: () => {}
-						});
-					}
-				}
-			}
-		}
-	};
-</script>
-
-<style>
-	.recommend {
-		overflow-x: hidden;
-	}
-
-	.push_product_title image {
-		width: 100%;
-		height: 48rpx;
-
-	}
-
-	.push_product_title .push_title {
-		width: 100%;
-		position: absolute;
-		left: 50%;
-		margin-left: -30rpx;
-		color: #333333;
-
-	}
-
-	.uni-flex-item2 input {
-		display: inline-block;
-		width: 20upx;
-	}
-
-	page {
-		background: #ffffff;
-	}
-
-	.jz_cart .btn {
-		border-radius: 6upx;
-		background: #cdcdcd;
-		letter-spacing: 4upx;
-	}
-
-	.jz_cart .activeBg {
-		background: #dd0101;
-	}
-
-	.jz_cart .activeDel {
-		background: #dd0101;
-	}
-
-	.gou {
-		display: block;
-		text-align: center;
-		color: #ffffff;
-		width: 40upx;
-		height: 40upx;
-		line-height: 40upx;
-	}
-
-	.push_product_title {
-		width: 100%;
-		padding: 30upx 0 0 0;
-		position: relative;
-	}
-
-	.push_product_title image {
-		width: 100%;
-		height: 48upx;
-	}
-
-	.push_product_title .push_title {
-		width: 100%;
-		position: absolute;
-		left: 50%;
-		margin-left: -30upx;
-		color: #333333;
-	}
-</style>

pages/user/fav/fav.vue

@@ -1,283 +0,0 @@
-<template>
-	<view class="uni-tab-bar">
-		<view class="uni-product-list favList">
-			<scroll-view scroll-y="false" class="scroll-Y" @scrolltolower="loadMore()">
-				<view class="uni-product uni-flex" v-for="(item,index) in newsitems[0].data" :key="index">
-					<view class="image-view" @click="goProduct(item)">
-						<image class="uni-product-image" :src="item.pic" />
-					</view>
-					<view class="uni-product-wrap uni-flex uni-column">
-						<view class="uni-product-title">{{item.title}}</view>
-						<view class="uni-flex uni-product-price uni-flex-item">
-							<view class="uni-flex uni-flex-item uni-product-price-original">
-								￥{{item.salePrice}}
-							</view>
-							<view class="uni-flex uni-flex-item uni-product-price-favour">
-								￥{{item.marketPrice}}
-							</view>
-						</view>
-					</view>
-					<view class="delCollection-wrap uni-flex">
-						<view class="delCollection" @click="fav(item,index)">取消收藏</view>
-					</view>
-				</view>
-
-				<view class="uni-tab-bar-loading">
-					<uni-load-more :loadingType="newsitems[0].loadingType" :contentText="loadingText"></uni-load-more>
-				</view>
-			</scroll-view>
-		</view>
-	</view>
-</template>
-
-<script>
-	import {
-		mapState,
-		mapMutations
-	} from 'vuex'
-
-	import favr from '../../../common/favr.js';
-	import uniLoadMore from '@/components/uni-load-more.vue';
-	export default {
-		computed: {
-			...mapState(['hasLogin', 'jyyUser', 'favs'])
-		},
-		components: {
-			uniLoadMore
-		},
-		data() {
-			return {
-				loadingText: {
-					contentdown: "上拉显示更多",
-					contentrefresh: "正在加载...",
-					contentnomore: "没有更多数据了"
-				},
-				user: {},
-				newsitems: [{
-					"loadingType": 0,
-					"pageIndex": 1,
-					"data": []
-				}],
-				show: true
-			}
-		},
-		onLoad(e) {
-			if (!this.hasLogin) {
-				uni.navigateTo({
-					url: '../login/login',
-				});
-			} else {
-				this.user = JSON.parse(this.jyyUser);
-			}
-		},
-		onReady() {
-			this.init();
-		},
-		methods: {
-			...mapMutations(['setFavs']),
-			init() {
-				this.getData();
-			},
-			fav(e, index) {
-				let id = e.favid
-				uni.request({
-					url: this.webUrl + 'Fav',
-					method: 'POST',
-					data: {
-						id: id,
-						mode: 1,
-						userid: this.user.id,
-						show: !this.show
-					},
-					header: {
-						'content-type': 'application/x-www-form-urlencoded'
-					},
-					success: res => {
-						uni.hideLoading();
-						if (res.data.result.isSuccess) {
-							this.setFavs(JSON.stringify(res.data.result.resultInfo2));
-							uni.showToast({
-								title: res.data.result.resultInfo,
-								icon: "none"
-							})
-							this.newsitems[0].data.splice(index, 1)
-						} else {
-							uni.showModal({
-								title: "系统提示",
-								content: res.data.result.resultInfo,
-								icon: "none"
-							})
-						}
-					},
-					fail: () => {},
-					complete: () => {}
-				});
-
-			},
-			goProduct(e) {
-				console.log(e)
-				uni.navigateTo({
-					url: '../../merchant/product/product?id=' + e.favid 
-				});
-			},
-			loadMore() {
-				setTimeout(() => {
-					this.addData();
-				}, 1200);
-			},
-			addData() {
-				this.getData();
-			},
-			getData() {
-				if (this.newsitems[0].loadingType === 2) {
-					return;
-				}
-				this.newsitems[0].loadingType = 1;
-				uni.request({
-					url: this.webUrl + 'Favs',
-					method: 'POST',
-					data: {
-						pageIndex: this.newsitems[0].pageIndex,
-						userid: this.user.id
-					},
-					header: {
-						'content-type': 'application/x-www-form-urlencoded'
-					},
-					success: res => {
-						if (res.data.result.uniFavs.length > 0) {
-							this.newsitems[0].data = this.newsitems[0].data.concat(res.data.result.uniFavs);
-						} else {
-							this.newsitems[0].loadingType = 2;
-							return;
-						}
-						if (this.newsitems[0].pageIndex == parseInt(res.data.result.pages)) {
-							this.newsitems[0].loadingType = 2;
-							return;
-						} else {
-							this.newsitems[0].loadingType = 0;
-						}
-						this.newsitems[0].pageIndex++;
-					},
-					fail: () => {},
-					complete: () => {}
-				});
-			}
-		}
-	}
-</script>
-
-<style>
-	.favList {
-		margin-top: 20upx;
-	}
-
-	.favList .uni-product-wrap {
-		position: relative;
-	}
-
-	.delCollection-wrap {
-		align-items: center;
-		justify-content: center;
-	}
-
-	.delCollection-wrap .delCollection {
-		width: 150upx;
-		height: 55upx;
-		line-height: 55upx;
-		text-align: center;
-		margin-right: 30upx;
-		margin-bottom: 5upx;
-		display: inline-block;
-		background: #fc6f05;
-		color: #fff;
-		border-radius: 60upx;
-		font-size: 24upx;
-	}
-
-	.image-view {
-		width: 160upx;
-		height: 160upx;
-		margin-left: 25upx;
-		border-radius: 10upx;
-	}
-
-	.image-view .uni-product-image {
-		width: 160upx;
-		height: 160upx;
-		border-radius: 10upx;
-	}
-
-	.uni-product-price-favour {
-		margin-left: 0;
-	}
-
-	.uni-product-list {
-		overflow-y: scroll;
-	}
-
-
-	.uni-product-wrap {
-		flex: 1;
-		margin-left: 30upx;
-		align-content: space-around;
-	}
-
-	.uni-product-number-wrap {
-		display: flex;
-		justify-content: space-between;
-		align-items: flex-end;
-	}
-
-	.uni-product {
-		width: 90%;
-		margin: 2%;
-		flex-direction: row;
-		background: #FFFFFF;
-		border-radius: 35upx;
-	}
-
-	.uni-product-number {
-		margin-right: 0;
-	}
-
-	.sellgroup {
-		width: 150upx;
-		height: 55upx;
-		line-height: 55upx;
-		text-align: center;
-		margin-right: 10upx;
-		margin-bottom: 5upx;
-		display: inline-block;
-		background: #fc6f05;
-		color: #fff;
-		border-radius: 60upx;
-		font-size: 24upx;
-	}
-
-	.uni-product-price-original {
-		margin-top: 10upx;
-	}
-
-	.uni-product-price-favour {
-		margin-top: 10upx;
-	}
-
-	.uni-tab-bar-container {
-		width: calc(100% - 20upx);
-		overflow: hidden;
-		margin-left: 10upx;
-	}
-
-	::-webkit-scrollbar {
-		/*隐藏滚轮*/
-		display: none;
-	}
-
-	.uni-product-price {
-		flex-direction: column;
-	}
-
-	.uni-tab-bar-loading {
-		margin: 0 auto;
-	}
-</style>

pages/user/income/income.vue

@@ -1,209 +0,0 @@
-<template>
-	<view class="jz_income uni-flex uni-column">
-		<view class="item_top uni-flex space-between">
-			<view class="dataBtn uni-flex justify-align-center" @click="onShowDatePicker('rangetime')">
-				<view class="date"> {{range[0]}} - {{range[1]}}</view>
-				<image src="../../../static/income/03.png"></image>
-			</view>
-			<view class="moneny uni-flex justify-align-center">收入 ￥{{income}}</view>
-		</view>
-		<view class="income_item uni-flex uni-column">
-
-			<view class="income_space"></view>
-			<view class="content_list uni-flex uni-column">
-				<view class="content_item_wrap">
-					<view class="content_item uni-flex space-between align-items" v-for="(item, key) in moneyLogList" :key="key"
-					 @click="goProduct(item)">
-						<view class="item_lf uni-flex align-items">
-							<view class="uni-flex justify-align-center lef-img">
-								<image :src="'../../../static/income/0'+item.rank+'.png'"></image>
-							</view>
-							<view class="item_titles uni-flex space-between uni-column">
-								<view class="" v-if="item.rank==1">推广收益 - 直接收益</view>
-								<view class="" v-if="item.rank==2">推广收益 - 间接收益</view>
-								<view class="uni-flex">
-									<view class="orderNo ">{{item.orderNo}}</view>
-								</view>
-								<view class="">{{item.createDate}}</view>
-							</view>
-						</view>
-
-						<view class="item_rt uni-flex  justify-align-center">
-							<view class="uni-flex uni-column">
-								<view>￥{{item.amount}}</view>
-								<view v-if="item.state==0" style="color: #666666;">未确认</view>
-								<view v-if="item.state==1" style="color: #666666;">已确认</view>
-							</view>
-							<view class="uni-flex justify-align-center rtLine" >
-								<uni-icon type="arrowright" size="20"></uni-icon>
-							</view>
-							
-						</view>
-					</view>
-				</view>
-
-			</view>
-
-		</view>
-		<load-more :loadingType="loadingType" :contentText="contentText"></load-more>
-		<mx-date-picker :show="showPicker" :type="type" :value="value" :show-tips="true" :begin-text="'开始'" :end-text="'结束'"
-		 :show-seconds="true" @confirm="onSelected" @cancel="onSelected" />
-	</view>
-</template>
-<script>
-	import {
-		mapState,
-		mapMutations
-	} from 'vuex'
-
-	import MxDatePicker from "@/components/mx-datepicker/mx-datepicker.vue";
-	import util from '../../../common/util.js'
-	import loadMore from '@/components/uni-load-more.vue';
-	import backTop from '@/components/uni-top.vue';
-	import uniIcon from '../../../components/uni-icon.vue';
-
-	var index;
-	var date = new Date();
-	var range = util.getMonthFirstLastDay(date.getFullYear(), date.getMonth() + 1);
-	export default {
-		components: {
-			MxDatePicker,
-			loadMore,
-			backTop,
-			uniIcon
-		},
-		computed: {
-			...mapState(['hasLogin', 'forcedLogin', 'jyyUser'])
-		},
-		data() {
-			return {
-				loadingType: 0,
-				contentText: {
-					contentdown: "上拉显示更多",
-					contentrefresh: "正在加载...",
-					contentnomore: "没有更多数据了"
-				},
-				backTop: {
-					"src": "../../static/top.png",
-					"scrollTop": 0
-				},
-				user: {},
-				moneyLogList: [],
-				showPicker: false,
-				type: 'rangetime',
-				range: range,
-				value: '',
-				income: 0,
-			}
-		},
-		onLoad() {
-			
-			if (!this.hasLogin) {
-				uni.navigateTo({
-					url: '../login/login',
-				});
-			} else {
-				range[0]='2019-11-01';
-				index = 1;
-				this.user = JSON.parse(this.jyyUser);
-				this.getData();
-			}
-
-		},
-		onPullDownRefresh() {
-			this.getData();
-			setTimeout(function() {
-				uni.stopPullDownRefresh();
-			}, 1000);
-		},
-		onReachBottom() {
-			this.getData();
-		},
-		methods: {
-			goProduct(e) {
-				uni.navigateTo({
-					url: 'product?id=' + e.id + '&userid=' + this.user.id
-				})
-			},
-			getData() {
-				if (this.loadingType !== 0) {
-					return;
-				}
-				uni.request({
-					url: this.webUrl + 'GetMoneyLog',
-					method: 'POST',
-					header: {
-						'content-type': 'application/x-www-form-urlencoded'
-					},
-					data: {
-						userid: this.user.id,
-						PageIndex: index,
-						begin: this.range[0],
-						end: this.range[1],
-					},
-					success: res => {
-						this.income = res.data.result.income.toFixed(2);
-						if (res.data.result.moneyLogList.length > 0) {
-							this.moneyLogList = this.moneyLogList.concat(res.data.result.moneyLogList);
-						} else {
-							this.loadingType = 2;
-							return;
-						}
-						if (index == parseInt(res.data.result.pages)) {
-							this.loadingType = 2;
-							return;
-						} else {
-							this.loadingType = 0;
-						}
-						index++;
-					},
-					fail: () => {},
-					complete: () => {}
-				});
-			},
-			onShowDatePicker(type) { //显示
-				this.type = type;
-				this.showPicker = true;
-				this.value = this[type];
-			},
-			onSelected(e) { //选择
-				this.showPicker = false;
-				if (e) {
-					this.range[0] = util.formatDate(e.value[0], "YY-MM-DD");
-					this.range[1] = util.formatDate(e.value[1], "YY-MM-DD");
-					index = 1;
-					this.loadingType = 0;
-					this.moneyLogList = [];
-					this.getData();
-				}
-			}
-		}
-	}
-</script>
-
-
-<style>
-	.rtLine{
-		color: #999999;
-		margin-left: 30upx;
-	}
-	
-	page {
-		height: auto;
-	}
-
-	.jz_income .mescroll-uni.mescroll-uni-fixed {
-		position: static;
-	}
-
-	.jz_income .orderNo {
-		width: 300upx;
-		overflow: hidden;
-		white-space: nowrap;
-		text-overflow: ellipsis;
-	}
-
-	.jz_income .orderNoTitle {
-		width: 110upx;
-	}
-</style>

pages/user/income/product.vue

@@ -1,106 +0,0 @@
-<template>
-	<view class="uni-flex uni-column order-items jz_incomeProduct" style="margin-top: 30upx;">
-		<view class="uni-flex uni-row uni-flex-item order-shop-name order-boder">
-			<view class="orderNo">
-				{{moneyLog.orderNo}}
-			</view>
-			<view class="uni-flex uni-flex-item order-status" style="color: #000000;">
-				{{moneyLog.buyer}}
-			</view>
-		</view>
-
-		<view class="uni-flex uni-row order-item align-items" v-for="(item,key) in items" :key="key">
-			<view class="uni-flex uni-flex-item pic item-padding">
-				<image mode="widthFix" :src="item.pic"></image>
-			</view>
-			<view class="uni-flex uni-column uni-flex-item3 item-padding">
-				<text class="uni-text order-title">{{item.title}}</text>
-				<text class="uni-text order-specs">{{item.productSpecsStr}}</text>
-				<text class="uni-text order-specs">分润</text>
-			</view>
-			<view class="uni-flex uni-column uni-flex-item item-padding">
-				<text class="uni-text price-red">￥{{item.totalPrice}}</text>
-				<text class="uni-text">x{{item.amount}}</text>
-				<text class="uni-text price-red">￥{{item.profit}}</text>
-			</view>
-		</view>
-		<view class="incomeAll uni-flex uni-column" style="background: #F4F5F6;">
-			<view class="uni-flex  space-between">
-				<view class="uni-flex order-line">
-					<text class="allCount">共{{allNum}}件商品</text>
-				</view>
-				<view class="uni-flex order-line">
-					合计：<text class="price-red allPrice">￥{{moneyLog.subTotal}}</text>
-				</view>
-			</view>
-			<view class="uni-flex space-between">
-				<view class="uni-flex order-line">
-					{{moneyLog.createDate}}
-				</view>
-				<view class="uni-flex order-line">
-					<text class="allCount">分润</text>：<text class="price-red allPrice">￥{{moneyLog.amount}}</text>
-				</view>
-			</view>
-		</view>
-		<view class="uni-flex order-line item-padding order-btn" style="height: 10upx;">
-		</view>
-	</view>
-
-</template>
-
-<script>
-	export default {
-		data() {
-			return {
-				id: '',
-				userid: '',
-				moneyLog: {},
-				items: []
-			}
-		},
-		computed: {
-			allNum() {
-				let num = 0;
-				for (let i = 0; i < this.items.length; i++) {
-					num += this.items[i].amount;
-				}
-				return num
-			}
-		},
-		onLoad(e) {
-			this.id = e.id;
-			this.userid = e.userid;
-			this.getData();
-		},
-		methods: {
-			getData() {
-				uni.request({
-					url: this.webUrl + 'GetMoneyLogView',
-					method: 'POST',
-					header: {
-						'content-type': 'application/x-www-form-urlencoded'
-					},
-					data: {
-						userid: this.userid,
-						id: this.id
-					},
-					success: res => {
-						if (res.data != null) {
-							this.moneyLog = res.data.data;
-							this.items = res.data.items;
-						}
-					},
-					fail: () => {},
-					complete: () => {}
-				});
-			}
-		}
-	}
-</script>
-
-<style>
-	.order-items .order-boder .orderNo {
-		width: 550upx;
-	}
-
-</style>

pages/user/login/login.vue

@@ -1,314 +0,0 @@
-<template>
-	<view class="jz_login">
-		<view class="uni-flex login-top">
-			<image mode="widthFix" src="../../../static/login/login_bg.png"></image>
-			<div class="waveWrapper waveAnimation">
-
-				<div class="circles">
-					<div class="circle"></div>
-					<div class="circle"></div>
-					<div class="circle"></div>
-					<div class="circle"></div>
-					<div class="circle"></div>
-					<div class="circle"></div>
-					<div class="circle"></div>
-				</div>
-
-
-
-			</div>
-		</view>
-		<view class=" space"></view>
-		<view class="login-box uni-column ">
-			<view class="login-form uni-flex uni-column">
-				<view class="logoImg uni-flex" @click="Home">
-					<image src="../../../static/login/login_logo.png"></image>
-				</view>
-				<view class="tab uni-flex uni-flex-item uni-column">
-					<view class="uni-flex uni-row login-tab">
-						<view @click="Mode(0)" class="uni-flex uni-flex-item  " v-bind:class="[current==0 ? activeClass : '']">
-							密码登录
-						</view>
-						<view @click="Mode(1)" class="uni-flex uni-flex-item  " v-bind:class="[current==1 ? activeClass : '']">
-							短信登录
-						</view>
-					</view>
-
-					<view class="uni-flex content uni-flex-item">
-						<view class="uni-flex uni-column" v-show="current === 0">
-							<view class="form-phone uni-flex">
-								<view class="form-phone-lf uni-flex">
-									<image src="../../../static/login/ico1.png"></image>
-								</view>
-								<input class="uni-flex-item userNameIput" placeholder-style="color:#e2e2e2" v-model="phone" name="input"
-								 placeholder="输入手机号码" />
-							</view>
-							<view class="form-phone uni-flex">
-								<view class="form-phone-lf uni-flex">
-									<image src="../../../static/login/ico2.png"></image>
-								</view>
-								<input class="uni-flex-item userNameIput" password placeholder-style="color:#e2e2e2" v-model="password" name="input"
-								 placeholder="输入登录密码" />
-							</view>
-						</view>
-						<view class="uni-flex uni-column" v-show="current === 1">
-							<view class="form-phone uni-flex">
-								<view class="form-phone-lf uni-flex">
-									<image src="../../../static/login/ico1.png"></image>
-								</view>
-								<input class="uni-flex-item userNameIput" placeholder-style="color:#e2e2e2" v-model="phone" name="input"
-								 placeholder="输入手机号码" />
-							</view>
-							<view class="form-phone uni-flex">
-								<view class="form-phone-lf uni-flex">
-									<image src="../../../static/login/login_message.png"></image>
-								</view>
-								<input class="uni-flex-item userNameIput" placeholder-style="color:#e2e2e2" v-model="code" name="input"
-								 placeholder="输入短信验证码" />
-								<view class="codeBtn uni-flex" >
-									<button class="send uni-flex-item" :type="type" size="mini" @click="SendEsms">{{content}}</button>
-								</view>
-							</view>
-						</view>
-					</view>
-
-				</view>
-				<view class="btnImg" @click="Login">
-					登录
-				</view>
-			</view>
-			<view class="login-tip uni-flex">
-				<view class="registerMsg" @click="goRegister">注册账号</view>
-				<view class="line"></view>
-				<view class="registerMsg" @click="goHome">返回首页</view>
-			</view>
-		</view>
-	</view>
-</template>
-
-<script>
-	import {
-		mapState,
-		mapMutations
-	} from 'vuex'
-	import group from '../../../common/group.js';
-	import sha1 from '../../../common/sha1.js';
-
-	export default {
-		computed: {
-			...mapState(['hasLogin', 'forcedLogin', 'jyyUser', 'favs'])
-		},
-		data() {
-			return {
-				url: "",
-				phone: "",
-				password: "",
-				code: "",
-				vcode: "",
-				current: 0,
-				activeClass: "login-tab-on",
-				content: '发送验证码',
-				totalTime: 10,
-				type: "primary",
-				canClick: true,
-			};
-		},
-		onLoad(e) {
-			this.url = e.url;
-			this.init();
-		},
-		methods: {
-			...mapMutations(['login', 'setFavs', 'setShare']),
-			goRegister() {
-				uni.navigateTo({
-					url: '../register/register'
-				})
-			},
-			goHome(){
-				uni.switchTab({
-					url:'../../home/home'
-				})
-			},
-			Mode(e) {
-				this.current = e;
-			},
-			Home() {
-				uni.switchTab({
-					url: '../../home/home'
-				})
-			},
-			init() {
-				if (this.hasLogin) {
-					uni.navigateBack({
-						delta: 1
-					});
-				}
-			},
-			SendEsms() {
-				if (this.phone == "") {
-					uni.showToast({
-						icon: "none",
-						title: "请填写手机号码",
-					})
-				} else {
-					if (!this.canClick) return //改动的是这两行代码
-					uni.showLoading({
-						title: "发送中"
-					});
-					uni.request({
-						url: this.webUrl + 'SendEsms',
-						method: 'POST',
-						data: {
-							mobile: this.phone
-						},
-						header: {
-							'content-type': 'application/x-www-form-urlencoded'
-						},
-						success: res => {
-							uni.hideLoading()
-							if (res.data.result.status == "1") {
-								this.vcode = res.data.result.code;
-								this.canClick = false
-								this.type = "default";
-								this.content = this.totalTime + 's'
-								let clock = setInterval(() => {
-									this.totalTime--
-									this.content = this.totalTime + 's'
-									if (this.totalTime < 0) {
-										clearInterval(clock)
-										this.content = '重新发送'
-										this.totalTime = 10
-										this.canClick = true //这里重新开启
-										this.type = "primary"
-									}
-								}, 1000)
-
-							} else {
-								uni.showToast({
-									icon: "none",
-									title: "发送失败",
-								})
-							}
-						},
-						fail: () => {},
-						complete: () => {}
-					});
-				}
-			},
-			Login() {
-				if (this.phone == "") {
-					uni.showToast({
-						icon: "none",
-						title: "请填写手机号",
-					});
-					return false;
-				}
-				if (this.current == 0) {
-					if (this.password == "") {
-						uni.showToast({
-							icon: "none",
-							title: "请填写登录密码",
-						});
-						return false;
-					}
-				} else {
-					if (this.code == "") {
-						uni.showToast({
-							icon: "none",
-							title: "请填写验证码",
-						});
-						return false;
-					}
-				}
-				uni.showLoading({
-					title: "登录中"
-				});
-				uni.request({
-					url: this.webUrl + 'login',
-					method: 'POST',
-					data: {
-						code: this.code,
-						vcode: this.vcode,
-						phone: this.phone,
-						current: this.current,
-						password: sha1.hex_sha1(this.password)
-					},
-					header: {
-						'content-type': 'application/x-www-form-urlencoded'
-					},
-					success: res => {
-						uni.hideLoading();
-						if (res.data.result.isSuccess) {
-							this.login(JSON.stringify(res.data.user));
-							this.setFavs(JSON.stringify(res.data.favs));
-							uni.navigateBack({
-								delta: 1
-							});
-						} else {
-							uni.showToast({
-								title: res.data.result.resultInfo,
-								icon: "none"
-							})
-						}
-					},
-					fail: () => {},
-					complete: () => {}
-				});
-			}
-			/* wxGetUserInfo(e) {
-				this.loading = true;
-				if (e.detail.errMsg !== 'getUserInfo:ok') {
-					uni.showModal({
-						title: "获取用户信息失败",
-						content: "错误原因" + e.detail.errMsg,
-						showCancel: false
-					});
-					return;
-				} else {
-					uni.request({
-						url: this.webUrl + 'Register',
-						method: 'POST',
-						data: {
-							code: this.code,
-							userInfo: JSON.stringify(e.detail.userInfo),
-							shareId: this.shareId
-						},
-						header: {
-							'content-type': 'application/x-www-form-urlencoded'
-						},
-						success: res => {
-							if (res.data.result.isSuccess) {
-								this.loading = false;
-								this.login(JSON.stringify(res.data.result.resultInfo));
-								this.setFavs(JSON.stringify(res.data.result.resultInfo2));
-								group.updateCart([]);
-								uni.navigateBack({
-									delta: 1
-								});
-							}
-						},
-						fail: () => {},
-						complete: () => {}
-					});
-
-				}
-			} */
-
-		}
-	}
-</script>
-<style>
-	page {
-		background: #FFFFFF;
-	}
-
-	.jz_login .btnImg {
-		width: 460upx;
-		text-align: center;
-		height: 80upx;
-		line-height: 80upx;
-		color: #FFFFFF;
-		background: url(../../../static/btn.png) no-repeat;
-		background-size: 460upx 80upx;
-	}
-</style>

pages/user/loginPassword/loginPassword.vue

@@ -1,118 +0,0 @@
-<template>
-	<view class="jz_beginCard uni-flex uni-column jz_loginPassword">
-		<form class="uni-flex uni-flex-item uni-column form" @submit="formSubmit" @reset="formReset">
-			<view class="uni-flex-item justify-align-center uni-flex uni-column">
-				<view class="beginCard_name uni-flex align-items">
-					<view class="uni-flex-item">输入新密码：</view>
-					<input type="text" password class="uni-flex-item3" v-model="newpassword" name="newpassword" placeholder="请输入新密码" />
-				</view>
-				<view class="beginCard_name uni-flex align-items">
-					<view class="uni-flex-item">确认新密码：</view>
-					<input type="text" password class="uni-flex-item3" v-model="confirmPassword" name="confirmPassword" placeholder="确认新密码" />
-				</view>
-				<view class="beginCard_btn">
-					<button formType="submit">
-						确认
-					</button>
-				</view>
-			</view>
-		</form>
-	</view>
-</template>
-
-<script>
-	var graceChecker = require('../../../common/graceChecker.js');
-	import sha1 from '../../../common/sha1.js';
-
-	import {
-		mapState,
-		mapMutations
-	} from 'vuex';
-
-	export default {
-		data() {
-			return {
-				newpassword: '',
-				code: '',
-				user: {}
-			}
-		},
-		computed: {
-			...mapState(['hasLogin', 'jyyUser'])
-		},
-		onLoad() {
-			if (!this.hasLogin) {
-				uni.navigateTo({
-					url: '../login/login',
-				});
-			} else {
-				this.user = JSON.parse(this.jyyUser);
-			}
-
-		},
-		methods: {
-			formSubmit: function(e) {
-
-				var rule = [{
-						name: 'newpassword',
-						checkType: 'notnull',
-						checkRule: '1',
-						errorMsg: '输入新密码'
-					},
-					{
-						name: 'confirmPassword',
-						checkType: 'notnull',
-						checkRule: '1',
-						errorMsg: '确认新密码'
-					}
-
-				];
-				//进行表单检查
-				var formData = e.detail.value;
-				var checkRes = graceChecker.check(formData, rule);
-
-				if (checkRes) {
-					uni.request({
-						url: this.webUrl + 'UpdatePass',
-						method: 'POST',
-						data: {
-							newpassword: sha1.hex_sha1(this.newpassword),
-							confirmPassword: sha1.hex_sha1(this.confirmPassword),
-							userId: this.user.id
-						},
-						header: {
-							'content-type': 'application/x-www-form-urlencoded'
-						},
-						success: res => {
-							uni.hideLoading();
-							uni.showToast({
-								title: res.data.result.resultInfo,
-								icon: 'none'
-							});
-						},
-						fail: () => {},
-						complete: () => {}
-					});
-				} else {
-					uni.showToast({
-						title: graceChecker.error,
-						icon: 'none'
-					});
-				}
-			},
-		}
-	}
-</script>
-
-<style>
-	.jz_beginCard .beginCard_btn button {
-		display: block;
-		width: 550upx;
-		height: 115upx;
-		line-height: 115upx;
-		font-size: 28upx;
-		color: #FFFFFF;
-		background: url(../../../static/btn.png) no-repeat;
-		background-size: 550upx 115upx;
-	}
-</style>

pages/user/message/index.vue

@@ -1,105 +0,0 @@
-<template>
-	<view class="jz_message uni-flex uni-column">
-
-		<view class="messageItem uni-flex align-items space-between uni-navigate-right" @click="goMessageItem(0)">
-			<view class="ItemLf uni-flex">
-				<view class="itemimg uni-flex  justify-align-center">
-					<image src="../../../static/message/01.png"></image>
-				</view>
-				<view class="itemcontent uni-flex uni-column">
-					<view class="message01">通知消息</view>
-					<view class="message02">{{messages[0].message}}条未读消息</view>
-				</view>
-			</view>
-			<view class="itemRt uni-flex justify-align-center">
-				<uni-icon type="arrowright" size="20"></uni-icon>
-			</view>
-		</view>
-
-		<!-- <view class="messageItem uni-flex align-items space-between" @click="goMessageItem">
-			<view class="ItemLf uni-flex">
-				<view class="itemimg uni-flex  justify-align-center">
-					<image src="../../static/message/03.png"></image>
-				</view>
-				<view class="itemcontent uni-flex uni-column">
-					<view class="message01">我的私信</view>
-					<view class="message02">暂无私信消息</view>
-				</view>
-			</view>
-			<view class="itemRt uni-flex justify-align-center">
-				<image src="../../static/message/02.png"></image>
-			</view>
-		</view> -->
-
-	</view>
-</template>
-
-<script>
-	import {
-		mapState,
-		mapMutations
-	} from 'vuex'
-
-	import uniIcon from '../../../components/uni-icon.vue'
-	export default {
-		data() {
-			return {
-				user: {},
-				messages: [{
-					"message": 0
-				}]
-			}
-		},
-		components:{
-			uniIcon
-		},
-		computed: {
-			...mapState(['hasLogin', 'jyyUser'])
-		},
-		onLoad() {
-			if (!this.hasLogin) {
-				uni.navigateTo({
-					url: '../login/login',
-				});
-			} else {
-				this.user = JSON.parse(this.jyyUser);
-				this.getData();
-			}
-		},
-		onShow() {
-			if (!this.hasLogin) {
-				uni.navigateTo({
-					url: '../login/login',
-				});
-			} else {
-				this.user = JSON.parse(this.jyyUser);
-				this.getData();
-			}
-		},
-		methods: {
-			goMessageItem(e) {
-				uni.navigateTo({
-					url: 'messageList?module=' + e
-				})
-			},
-			getData() {
-				uni.request({
-					url: this.webUrl + 'GetNoReadMessageCount',
-					data: "userid=" + this.user.id,
-					method: 'POST',
-					header: {
-						'content-type': 'application/x-www-form-urlencoded'
-					},
-					success: res => {
-						this.messages = res.data.data;
-					},
-					fail: () => {},
-					complete: () => {}
-				});
-			}
-		}
-	}
-</script>
-
-<style>
-</style>

pages/user/message/messageList.vue

@@ -1,126 +0,0 @@
-<template>
-	<view class="jz_messageItem uni-flex uni-column align-items">
-
-
-		<view class="uni-flex" v-for="(mess,key) in messages" :key="key" @click="goMessage(mess)">
-			
-			<view v-if="mess.mode==0" class="list_item uni-flex uni-column align-items">
-				<view class="item_time uni-flex justify-align-center">{{mess.createDate}}</view>
-				<view class="item_content uni-flex uni-column">
-					<view class="content_title uni-flex space-between align-items">
-						<view>{{mess.title}}</view>
-						<image class="activeimg" src="../../../static/message/noactive.png" v-if="mess.state==1"></image>
-						<image   class="activeimg" src="../../../static/message/active.png" v-if="mess.state==0" ></image>
-					</view>
-					<view class="conten_detail">{{mess.intro}}</view>
-				</view>
-			</view>
-
-			<view v-if="mess.mode==1" class="list_item uni-flex uni-column align-items">
-				<view class="item_time uni-flex justify-align-center">{{mess.createDate}}</view>
-				<view class="item_content uni-flex uni-column">
-					<view class="content_title uni-flex space-between align-items">
-						<view>{{mess.title}}</view>
-						<image class="activeimg" src="../../../static/message/noactive.png" v-if="mess.state==1"></image>
-						<image   class="activeimg" src="../../../static/message/active.png" v-if="mess.state==0" ></image>
-					</view>
-					<image :src="mess.pic"></image>
-					<view class="conten_detail">{{mess.intro}}</view>
-				</view>
-			</view>
-		</view>
-		<load-more :loadingType="loadingType" :contentText="contentText"></load-more>
-	</view>
-</template>
-
-<script>
-	import {
-		mapState,
-		mapMutations
-	} from 'vuex'
-
-
-	import loadMore from '@/components/uni-load-more.vue';
-	var index;
-	export default {
-		data() {
-			return {
-				loadingType: 0,
-				contentText: {
-					contentdown: "上拉显示更多",
-					contentrefresh: "正在加载...",
-					contentnomore: "没有更多数据了"
-				},
-				user: {},
-				messages: [],
-				module: 0
-			}
-		},
-		computed: {
-			...mapState(['hasLogin', 'jyyUser'])
-		},
-		onLoad(e) {
-			index = 1;
-			this.module = e.module;
-			if (!this.hasLogin) {
-				uni.navigateTo({
-					url: '../login/login',
-				});
-			} else {
-				this.user = JSON.parse(this.jyyUser);
-				this.getData();
-			}
-		},
-		onReachBottom() {
-			this.getData();
-		},
-		components: {
-			loadMore
-		},
-		methods: {
-			goMessage(e) {
-				uni.navigateTo({
-					url: 'messageView?id=' + e.id+ '&userid=' + this.user.id
-				})
-			},
-			getData() {
-				if (this.loadingType !== 0) {
-					return;
-				}
-				this.loadingType = 1;
-				uni.request({
-					url: this.webUrl + 'GetMessageList',
-					method: 'POST',
-					data: {
-						pageIndex: index,
-						userid: this.user.id,
-						module: this.module
-					},
-					header: {
-						'content-type': 'application/x-www-form-urlencoded'
-					},
-					success: res => {
-						if (res.data.result.messages.length > 0) {
-							this.messages = this.messages.concat(res.data.result.messages);
-						} else {
-							this.loadingType = 2;
-							return;
-						}
-						if (index == parseInt(res.data.result.pages)) {
-							this.loadingType = 2;
-							return;
-						} else {
-							this.loadingType = 0;
-						}
-						index++;
-					},
-					fail: () => {},
-					complete: () => {}
-				});
-			}			
-		}
-	}
-</script>
-
-<style>
-</style>

pages/user/message/messageView.vue

@@ -1,122 +0,0 @@
-<template>
-	<view class="uni-flex article uni-column">
-		<view class="uni-flex uni-h4  article-title">{{article.title}}</view>
-		<view class="uni-flex  color-555 article-time">
-			<view class="" style="font-size: 24upx;">{{article.createDate}}</view>
-		</view>
-		<view class="uni-flex pic" v-if="mode==1"><image :src="article.pic" mode="widthFix"></image></view>
-		<view class="uni-flex ">
-			<u-parse :content="htmlString" @preview="preview" @navigate="navigate" />
-		</view>
-	</view>
-</template>
-
-<script>
-	import marked from '../../../components/marked'
-	import uParse from '@/components/u-parse/u-parse.vue'
-	export default {
-		components: {
-			uParse
-		},
-		data() {
-			return {
-				id: 0,
-				article: {},
-				htmlString: "",
-				userid : 0,
-				mode: 0
-			};
-		},
-		onLoad(e) {
-			this.id = e.id;
-			this.userid = e.userid;
-			this.getData();
-		},
-		methods: {
-			preview(src, e) {
-				// do something
-				//console.log("src: " + src);
-			},
-			navigate(href, e) {
-				// 如允许点击超链接跳转，则应该打开一个新页面，并传入href，由新页面内嵌webview组件负责显示该链接内容
-				//console.log("href: " + href);
-				/* uni.showModal({
-					content: "点击链接为：" + href,
-					showCancel: false
-				}) */
-			},
-			getData() {
-				uni.showLoading({
-					title: '页面加载中',
-					mask: true
-				});
-				uni.request({
-					url: this.webUrl + 'GetMessageView',
-					method: 'POST',
-					data: {
-						userid: this.userid,
-						id: this.id
-					},
-					header: {
-						'content-type': 'application/x-www-form-urlencoded'
-					},
-					success: res => {
-						uni.hideLoading();
-							this.article = res.data.data;
-							this.mode =this.article.mode;
-							uni.setNavigationBarTitle({
-								title: this.article.title
-							});
-							this.htmlString = marked(this.article.reMark);
-					},
-					fail: () => {},
-					complete: () => {}
-				});
-			}
-		}
-	}
-</script>
-
-<style>
-	/* @import url("../../../components/gaoyia-parse/parse.css"); */
-	@import url("../../../components/gaoyia-parse/parse.css");
-	.article .article-title, .article-time,.pic{
-		padding: 0 50upx;
-	}
-	.article .pic {
-		margin-top: 45upx;
-		/* #ifdef H5 */
-		margin-bottom: 45upx;
-		/* #endif */
-		margin-bottom: ;
-	}
-	.article .article-title {
-		margin-top: 50upx;
-		margin-bottom: 10upx;
-	}
-
-	.article .article-time {
-		font-size: 22upx;
-		color: #919294;
-		justify-content: space-between;
-	}
-	
-	.article .article-time .article-btn {
-		width: 100upx;
-		height: 42upx;
-		text-align: center;
-		line-height: 42upx;
-		color: #fceaea;
-		background: #dd0000;
-	}
-	
-	.article .wxParse .p {
-		text-indent: 2em;
-	}
-	
-	.article .wxParse .img{
-		width: 730upx !important;
-		margin-left:  11.5upx;
-		margin-bottom: 3upx;
-	}
-</style>

pages/user/myAgency/index.vue

@@ -1,927 +0,0 @@
-<template>
-	<view class="uni-flex lists jz_lists uni-column jz_myfit jz_agent cart jz_cart ">
-		<view class="tab-search uni-column" style="background-color: #F1F1F1;">
-			<view class="tabList">
-				<scroll-view class="uni-flex uni-swiper-tab" scroll-x :scroll-left="scrollLeft" id="tab-bars">
-					<view v-for="(tab, i) in categorys" :key="i" class="swiper-tab-list" :id="'tab' + tab.id" :data-current="index" @click="changeTab(i, tab)">
-						<view class="productTitle-item uni-flex uni-column">
-							<view :class="['picname', curIndex == i ? 'activeLine' : '']">{{ tab.title }}</view>
-						</view>
-					</view>
-				</scroll-view>
-			</view>
-
-			<view class="search uni-flex ">
-				<view class="uni-flex-item uni-flex search-input">
-					<input
-						placeholder="请选择地区"
-						@input="inputChange"
-						v-model="key"
-						:focus="isFocus"
-						@focus="focus"
-						@blur="blur"
-						class="uni-flex-item"
-						disabled="disabled"
-						@click="showMulLinkageThreePicker"
-					/>
-					<view class="icon icon-del uni-flex justify-align-center" style="height: 100%;" @click.stop="clear" v-if="isDelShow"><icon type="clear" size="12"></icon></view>
-				</view>
-
-				<view class="searchBtn uni-flex justify-align-center" @click="search">
-					<image src="../../../static/search02.png"></image>
-					<text>搜索</text>
-				</view>
-			</view>
-		</view>
-
-		<view class="agent-product uni-flex uni-column">
-			<view class="agentTop uni-flex space-between" id="list">
-				<view class="topItem uni-flex uni-column align-items " v-if="item.agency == 2" v-for="(item, key) in products" :key="key" @click.stop="selected(products, key)">
-					<view class="uni-flex  topItem-wrap">
-						<image
-							class="image topImg"
-							:class="{ lazy: !item.display }"
-							:id="'lazy' + key"
-							:data-index="0"
-							@load="imageOnLoad(item, key)"
-							:src="item.display ? item.pic : ''"
-						/>
-						<view class="loadbox" :class="{ loaded: item.loaded }"><view class="load"></view></view>
-					</view>
-					<view class=" uni-flex  uni-column">
-						<view class="uni-flex agencyTitle justify-align-center" v-if="!item.show">{{ item.title }}</view>
-						<view class=" agencyTitle titleSingle " v-if="item.show">{{ item.title }}</view>
-						<view class="uni-flex justify-align-center" style="color: #f00000;" v-if="user.agency == 1">￥{{ item.salePrice.toFixed(2) }}</view>
-					</view>
-					<view class="selectBtn uni-flex ">
-						<image src="../../../static/select.png" v-if="!item.select"></image>
-						<image src="../../../static/selectActive.png" v-if="item.select"></image>
-					</view>
-				</view>
-			</view>
-			<view class="agentBottom uni-flex space-between"></view>
-		</view>
-		<load-more :loadingType="loadingType" :contentText="contentText" class="loadMore"></load-more>
-		<backTop :src="backTop.src" :scrollTop="backTop.scrollTop"></backTop>
-		<mpvue-city-picker
-			:themeColor="themeColor"
-			ref="mpvueCityPicker"
-			:pickerValueDefault="cityPickerValueDefault"
-			@onCancel="onCancel"
-			@onConfirm="onConfirm"
-			@onReset="onReset"
-		></mpvue-city-picker>
-		<view class="uni-flex uni-row footer" v-if="products.length > 0&&isShow==true">
-			<view class="uni-flex uni-flex-item ">
-				<view class="uni-flex item-sel ">
-					<view :class="[yuan, { bg: allSelect }]" @click="AllSelect()"><text v-if="allSelect" class="gou"></text></view>
-				</view>
-				<view class="uni-flex uni-flex-item itemAll">全选</view>
-				<view class="uni-flex uni-flex-item3"></view>
-				<view class="uni-flex uni-flex-item3 justify-align-center">
-					<view class="uni-flex uni-flex-item btn" @click="js()" :class="{ activeBg: bgChange }">加入购物车({{ allNum }})</view>
-				</view>
-			</view>
-		</view>
-	</view>
-</template>
-
-<script>
-import { mapState, mapMutations } from 'vuex';
-import mpvueCityPicker from '@/components/mpvue-citypicker/mpvueCityPicker.vue';
-import util from '../../../common/util.js';
-import address from '../../../common/getAddessId.js';
-import amap from '../../../common/amap-wx.js';
-import loadMore from '@/components/uni-load-more.vue';
-import backTop from '@/components/uni-top.vue';
-import cart from '../../../common/cart.js';
-
-var index;
-export default {
-	computed: {
-		...mapState(['hasLogin', 'forcedLogin', 'jyyUser'])
-	},
-	components: {
-		loadMore,
-		backTop,
-		mpvueCityPicker
-	},
-	data() {
-		return {
-			isShow: false,
-			newProducts: [],
-			allNum: 0,
-			filterCount: 0,
-			allSelect: false,
-			bgChange: false,
-			cityPickerValueDefault: [0, 0, 1],
-			themeColor: '#007AFF',
-			pickerText: '',
-			amapPlugin: null,
-			amapKey: '408ca849e7fb38410487446db08ec898',
-			addressName: '',
-			backTop: {
-				src: '../../../static/top.png',
-				scrollTop: 0
-			},
-			loadingType: 0,
-			contentText: {
-				contentdown: '上拉显示更多',
-				contentrefresh: '正在加载...',
-				contentnomore: '没有更多数据了'
-			},
-			active: false,
-			isDelShow: false,
-			isFocus: false,
-			sortNavfixed: false,
-			show: false,
-			windowHeight: 0,
-			type: 0,
-			cates: [
-				{
-					css: '',
-					id: '0',
-					no: '000',
-					show: '0',
-					subs: [],
-					title: '全部品牌'
-				}
-			],
-			categorys: [
-				{
-					ico: '../../../static/merchant/all.png',
-					id: '000',
-					no: '000',
-					title: '全部品牌'
-				}
-			],
-			category: {},
-			products: [],
-			curIndex: 0,
-			key: '',
-			id: '000',
-			scrollLeft: 0,
-			scrollY: 0,
-			agentStatus: 1,
-			user: {},
-			addressId: '',
-			popupType: '',
-			popupContent: '',
-			popupShow: false
-		};
-	},
-	onPageScroll(e) {
-		this.backTop.scrollTop = e.scrollTop;
-		util.loads(this.products, 'list', this.windowHeight);
-		uni.createSelectorQuery()
-			.selectAll('#list')
-			.boundingClientRect(datas => {
-				this.sortNavfixed = parseInt(datas[0].top) < 78 ? true : false;
-			})
-			.exec();
-	},
-	onShow() {},
-	onLoad(e) {
-		this.user = JSON.parse(this.jyyUser);
-		index = 1;
-		this.windowHeight = uni.getSystemInfoSync().windowHeight;
-		this.getCategory();
-		if (e.n > 4) {
-			setTimeout(() => {
-				this.public(e.n, e);
-			}, 200);
-		}
-		// #ifdef MP-WEIXIN
-		this.amapPlugin = new amap.AMapWX({
-			key: this.amapKey
-		});
-		this.getRegeo();
-		// #endif
-		// #ifdef H5
-		uni.getLocation({
-			type: 'wgs84',
-			geocode: true,
-			success: res => {
-				let gitude = res.longitude + ',' + res.latitude;
-				let that = this;
-				uni.request({
-					url: 'https://restapi.amap.com/v3/geocode/regeo',
-					method: 'POST',
-					header: {
-						'content-type': 'application/x-www-form-urlencoded'
-					},
-					data: {
-						output: 'JSON',
-						location: gitude,
-						key: 'bf5fad85b6706db59ac208af908aa99e'
-					},
-					success: result => {
-						let addresss = result.data.regeocode.addressComponent;
-						console.log(address);
-						let province = addresss.province;
-						let city = addresss.city;
-						let district = addresss.district;
-						that.addressName = province + '-' + city + '-' + district;
-						that.addressId = address.getAddressid(province, city, district);
-						that.key = that.addressName;
-						that.getData();
-					},
-					fail: () => {},
-					complete: () => {}
-				});
-			}
-		});
-		// #endif
-	},
-	onPullDownRefresh() {
-		this.getData();
-		setTimeout(function() {
-			uni.stopPullDownRefresh();
-		}, 1000);
-	},
-	onReachBottom() {
-		this.getData();
-	},
-	watch: {},
-	methods: {
-		...mapMutations(['setAgency']),
-		//单选
-		selected(e, index) {
-			this.newProducts = [];
-			let select = e[index].select;
-			e[index].select = !select;
-			this.$set(this.products[index], 'select', e[index].select);
-
-			//判断商品是否全部选中，是的话，全选也选中
-			let json = this.products.length;
-			for (let j = 0; j < this.products.length; j++) {
-				if (this.products[j].agency == 2) {
-					this.newProducts.push(this.products[j]);
-				}
-			}
-			let all = true;
-			console.log(this.newProducts);
-			for (let i = 0; i < this.newProducts.length; i++) {
-				all *= this.newProducts[i].select;
-			}
-			if (all == true) {
-				this.allSelect = true;
-			} else {
-				this.allSelect = false;
-			}
-			this.allSl();
-		},
-		// 全选
-		AllSelect() {
-			let selected = this.allSelect;
-			this.allSelect = !selected;
-			let arr = this.products;
-			for (let i = 0; i < arr.length; i++) {
-				if (arr[i].agency == 2) {
-					//循环商品为选中
-					if (this.allSelect == true) {
-						this.products[i].select = true;
-					}
-					if (this.allSelect == false) {
-						this.products[i].select = false;
-					}
-				}
-			}
-			this.allSl(); //商品数量
-		},
-		//结算商品数量
-		allSl() {
-			let js = 0;
-			let arr = this.products;
-			for (let i = 0; i < arr.length; i++) {
-				js += this.products[i].select;
-			}
-			this.allNum = js;
-			if (this.allNum > 0) {
-				this.bgChange = true;
-			} else {
-				this.bgChange = false;
-			}
-		},
-		// 结算
-		js() {
-			let idStr = '';
-			for (let i = 0; i < this.products.length; i++) {
-				if (this.products[i].select) {
-					idStr += this.products[i].id + ',';
-				}
-			}
-			let str = idStr.slice(0, idStr.length - 1);
-			if (str == '') {
-				uni.showToast({
-					title: '请选择商品！',
-					icon: 'none'
-				});
-				return;
-			}
-			uni.showLoading({
-				title: '操作中'
-			});
-
-			uni.request({
-				url: this.webUrl + 'FlashCart',
-				method: 'POST',
-				header: {
-					'content-type': 'application/x-www-form-urlencoded'
-				},
-				data: {
-					userId: this.user.id,
-					id: str
-				},
-				success: res => {
-					uni.hideLoading();
-					if (res.data.result.length > 0) {
-						cart.addCart(res.data.result);
-						//cart.updateCart();
-						uni.switchTab({
-							url: '../cart/cart'
-						});
-					} else {
-						uni.showToast({
-							title: '操作失败',
-							icon: 'none'
-						});
-					}
-				},
-				fail: () => {},
-				complete: () => {}
-			});
-		},
-		onConfirm(e) {
-			this.pickerText = e.label;
-			this.key = this.pickerText;
-			this.addressId = e.id;
-		},
-		getRegeo() {
-			uni.showLoading({
-				title: '获取信息中'
-			});
-			this.amapPlugin.getRegeo({
-				success: data => {
-					let province = data[0].regeocodeData.addressComponent.province;
-					let city = data[0].regeocodeData.addressComponent.city;
-					let district = data[0].regeocodeData.addressComponent.district;
-					this.addressName = province + '-' + city + '-' + district;
-					this.addressId = address.getAddressid(province, city, district);
-					this.key = this.addressName;
-					this.getData();
-					uni.hideLoading();
-				}
-			});
-		},
-		showMulLinkageThreePicker() {
-			this.$refs.mpvueCityPicker.show();
-		},
-		focus() {
-			this.active = true;
-			//HM修改 增加获取焦点判断
-			if (this.key != '') {
-				this.isDelShow = true;
-			}
-		},
-		inputChange(event) {
-			var keyword = event.detail.value;
-			this.$emit('input', keyword);
-			if (this.key) {
-				this.isDelShow = true;
-			}
-		},
-		blur() {
-			this.isFocus = false;
-			if (!this.key) {
-				this.active = false;
-			}
-		},
-		clear() {
-			//HM修改 收起键盘
-			uni.hideKeyboard();
-			this.isFocus = false;
-			this.key = '';
-			this.active = false;
-			//HM修改 清空内容时候触发组件input
-			this.isDelShow = false;
-		},
-		search() {
-			index = 1;
-			this.loadingType = 0;
-			this.allNum = 0;
-			this.allSelect = false;
-			this.bgChange = false;
-			this.products = [];
-			this.getData();
-		},
-		onCancel(e) {
-			//console.log(e)
-		},
-		onReset() {
-			this.pickerText = '';
-			this.key = '';
-		},
-
-		getData() {
-			if (this.loadingType !== 0) {
-				return;
-			}
-			uni.request({
-				url: this.webUrl + 'List',
-				method: 'POST',
-				header: {
-					'content-type': 'application/x-www-form-urlencoded'
-				},
-				data: {
-					pageNum: index,
-					brand: this.id,
-					area: this.key,
-					userid: this.user.id,
-					pageSize: 100,
-					agentStatus: 1,
-					agency: this.user.agency
-				},
-				success: res => {
-					if (res.data.result.ratioProducts.length > 0) {
-						this.products = this.products.concat(res.data.result.ratioProducts);
-						for (let i = 0; i < this.products.length; i++) {
-							if (this.products[i].agency == 2) {
-								this.isShow = true;
-								break
-							}else{
-								this.isShow = false;
-							}
-						}
-						setTimeout(() => {
-							util.loads(this.products, 'list', this.windowHeight);
-						}, 500);
-					} else {
-						this.loadingType = 2;
-						return;
-					}
-					if (index == parseInt(res.data.result.pages)) {
-						this.loadingType = 2;
-						return;
-					} else {
-						this.loadingType = 0;
-					}
-					index++;
-				},
-				fail: () => {},
-				complete: () => {}
-			});
-		},
-		getElSize(id) {
-			//得到元素的size
-			return new Promise((res, rej) => {
-				uni.createSelectorQuery()
-					.select('#' + id)
-					.fields(
-						{
-							size: true,
-							scrollOffset: true
-						},
-						data => {
-							res(data);
-						}
-					)
-					.exec();
-			});
-		},
-		async public(i, e) {
-			this.id = e.id;
-			let index = i;
-			let tabBars = await this.getElSize('tab-bars'),
-				tabBarScrollLeft = tabBars.scrollLeft; //点击的时候记录并设置scrollLeft
-			let width = 0;
-			for (let j = 0; j < index; j++) {
-				let result = await this.getElSize('tab' + this.categorys[j].id);
-				width += result.width;
-			}
-			let winWidth = uni.getSystemInfoSync().windowWidth,
-				nowElement = await this.getElSize('tab' + this.categorys[index].id),
-				nowWidth = nowElement.width;
-			if (width + nowWidth - tabBarScrollLeft > winWidth - nowWidth) {
-				this.scrollLeft = width + nowWidth * 3 - winWidth;
-			}
-
-			if (width < tabBarScrollLeft) {
-				this.scrollLeft = width;
-			}
-		},
-		changeTab(i, e) {
-			if (this.curIndex === i) {
-				return false;
-			} else {
-				this.public(i, e);
-				this.isClickChange = true;
-				this.curIndex = i;
-				index = 1;
-				this.loadingType = 0;
-				this.products = [];
-				this.allNum = 0;
-				this.allSelect = false;
-				this.bgChange = false;
-				this.getData();
-				setTimeout(() => {
-					util.loads(this.products, 'list', this.windowHeight);
-				}, 500);
-			}
-		},
-		imageOnLoad(e) {
-			e.loaded = true;
-		},
-		getCategory() {
-			uni.request({
-				url: this.webUrl + 'Brands',
-				method: 'POST',
-				header: {
-					'content-type': 'application/x-www-form-urlencoded'
-				},
-				success: res => {
-					this.cates = this.cates.concat(res.data.result.brands);
-					this.categorys = this.categorys.concat(res.data.result.brands);
-				},
-				fail: () => {},
-				complete: () => {}
-			});
-		}
-	}
-};
-</script>
-
-<style>
-/*----- 改动的 */
-/* #ifdef H5 */
-.jz_cart .footer{
-	bottom: 0!important;
-}
-/* #endif */
-.activeBg {
-	background: #dd0101 !important;
-}
-
-.jz_cart.jz_agent .btn {
-	border-radius: 6rpx;
-	background: #cdcdcd;
-	letter-spacing: 4rpx;
-}
-
-.jz_agent .center {
-	width: 100%;
-}
-
-.jz_agent .selectContent {
-	padding: 0 20upx;
-}
-
-.jz_agent .selectBtn {
-	position: absolute;
-	right: 0upx;
-	bottom: 0upx;
-}
-
-.jz_agent .selectBtn image {
-	width: 40upx;
-	height: 40upx;
-}
-
-.jz_agent .agencyStatus {
-	position: absolute;
-	top: 50%;
-	left: 50%;
-	margin-left: -50upx;
-	margin-top: -50upx;
-	width: 100upx;
-	height: 100upx;
-	background: rgba(0, 0, 0, 0.4);
-	z-index: 888;
-	border-radius: 50%;
-	color: #ffffff;
-}
-
-.jz_agent .loadMore {
-	margin-bottom: 100upx;
-}
-
-.jz_agent .agent-product .agentTop .topItem {
-	position: relative;
-	padding-bottom: 40upx;
-	border-radius: 8upx;
-	box-shadow: 0 0 10rpx 0 #b2b2b2;
-	margin-bottom: 30upx;
-}
-
-.jz_agent .beginCard_btn {
-	position: fixed;
-	left: 0;
-	bottom: 20upx;
-	width: 100%;
-	z-index: 999;
-}
-
-.jz_agent .beginCard_btn button {
-	display: block;
-	width: 550upx;
-	height: 115upx;
-	line-height: 115rpx;
-	font-size: 28rpx;
-	background: url(../../../static/btn.png) no-repeat;
-	background-size: 550upx 115upx;
-	color: #ffffff;
-}
-
-.jz_agent .checkStyle {
-	position: absolute;
-	top: 0upx;
-	left: -16upx;
-	width: 0;
-	height: 0;
-	z-index: 100;
-	border-top: 50upx solid #11c200;
-	border-right: 50upx solid transparent;
-}
-
-.jz_agent .checkStyleActick {
-	position: absolute;
-	top: 0upx;
-	left: -16upx;
-	width: 0;
-	height: 0;
-	z-index: 100;
-	border-top: 50upx solid #ff0000;
-	border-right: 50upx solid transparent;
-}
-
-.jz_agent .topItem {
-	position: relative;
-	z-index: 666;
-	overflow: hidden;
-}
-
-.jz_agent .swiper-tab-list {
-	width: 170upx !important;
-}
-
-.jz_lists scroll-view.uni-swiper-tab {
-	padding-top: 0upx !important;
-}
-
-.jz_myfit.jz_lists scroll-view.uni-swiper-tab {
-	padding-top: 0upx !important;
-	margin-bottom: 0upx !important;
-	padding-bottom: 0upx;
-}
-
-.jz_agent .agencyBtn {
-	color: #09bb07;
-	background: #11c200 !important;
-	padding: 0 10upx;
-}
-
-.jz_agent .agent-product {
-	margin-top: 235upx !important;
-}
-
-/* ------改动的 */
-
-.jz_agent .agencyTitle.titleSingle {
-	margin: 0 auto;
-	width: 210upx;
-	font-size: 26upx;
-	overflow: hidden;
-	text-overflow: ellipsis;
-	white-space: nowrap;
-	text-align: center;
-}
-
-.jz_agent .topItem-wrap {
-	width: 224upx;
-	height: 224upx;
-	position: relative;
-}
-
-.jz_agent .agencyTitle {
-	width: 224upx;
-	overflow: hidden;
-	white-space: nowrap;
-}
-
-.jz_agent .search-input .icon-del.icon {
-	width: 50upx;
-	top: 0;
-}
-
-.jz_myfit .loadbox {
-	border-top-left-radius: 20upx;
-	border-top-right-radius: 20upx;
-}
-
-.tab-search {
-	position: fixed;
-	width: 100%;
-	z-index: 8888;
-}
-
-.jz_myfit.jz_lists scroll-view.uni-swiper-tab {
-	margin-bottom: 0;
-}
-
-.jz_agent .agent-product {
-	margin-top: 320upx;
-}
-
-.fixed {
-	width: 100%;
-	position: fixed;
-	left: 0;
-	top: 0;
-	/* #ifdef H5 */
-	/* top: 84upx; */
-	top: 44px;
-	/* #endif */
-	background: #ffffff;
-	margin: 0 !import;
-	z-index: 999;
-	box-sizing: border-box;
-	border-bottom: 2upx solid #eeeeee;
-	transform: translateZ(0);
-	-webkit-transform: translateZ(0);
-}
-
-.activeLine {
-	border-bottom: 2upx solid #ff273c;
-}
-
-.jz_lists {
-	position: relative;
-}
-
-.jz_lists scroll-view.uni-swiper-tab {
-	border-bottom: 0;
-	height: auto;
-	line-height: auto;
-	padding-top: 20upx;
-}
-
-.jz_lists .productTitle-item {
-	justify-content: center;
-	align-items: center;
-}
-
-.jz_lists .productTitle-item .picname {
-	line-height: 60upx;
-}
-
-.jz_lists .productTitle-item image {
-	width: 50upx;
-	height: 50upx;
-}
-
-.lists .sortNav .Nav:first-child {
-	/* border-left: none; */
-}
-
-.list .tab-bar-wrap {
-	width: 200upx;
-}
-
-::-webkit-scrollbar {
-	display: none;
-}
-
-.lists .nav-left {
-	width: 218upx;
-	border-right: solid 1upx #e0e0e0;
-	padding-top: 20upx;
-	box-sizing: border-box;
-}
-
-.lists .nav-left .nav-left-title {
-	height: 80upx;
-	font-weight: 600;
-	margin: 0 auto;
-	margin-left: 10upx;
-}
-
-.lists .nav-left-item {
-	height: 110upx;
-	font-size: 30upx;
-	display: flex;
-	align-items: center;
-	justify-content: center;
-}
-
-.lists .nav-left-item image {
-	width: 40upx;
-	height: 40upx;
-	margin-right: 18upx;
-}
-
-.lists .nav-right {
-	width: 100%;
-	box-sizing: border-box;
-}
-
-.uni-tab-bar-loading {
-	width: 100%;
-}
-
-.uni-tab-bar-loading .loading-text {
-	margin-top: 50upx;
-	font-size: 28upx;
-	text-align: center;
-}
-
-.lists .list {
-	width: 100%;
-	height: 92%;
-}
-
-#tab-bar {
-	background-color: #ffffff;
-	padding-bottom: 60upx;
-	overflow: hidden;
-}
-
-.uni-tab-bar .active {
-	color: #ffe200;
-	/* border-left: 10upx solid #ffe200; */
-}
-
-.prices .prices-cart image {
-	width: 52upx;
-	height: 50upx;
-	margin-right: 10upx;
-}
-
-.prices .prices-salePrice {
-	font-size: 22upx;
-	color: #f00000;
-}
-
-.image {
-	position: absolute;
-	width: 100%;
-	height: 100%;
-}
-
-.placeholder {
-	background: #e2e2e2 url(../../../static/load.gif) center center no-repeat;
-	opacity: 1;
-	transition: opacity 0.4s linear;
-}
-
-.placeholder.loaded {
-	opacity: 0;
-}
-
-.list-collapse {
-	padding-left: 36upx;
-	box-sizing: border-box;
-}
-
-.lists .sortNav .navActive {
-	color: #d80000;
-}
-
-.uni-filter {
-	margin-top: 8upx;
-	background-color: #ffffff;
-	padding: 16upx 24upx;
-	font-size: 28upx;
-	justify-content: space-between;
-	position: relative;
-}
-
-.uni-filter .uni-filter-item {
-	background-color: #f1f1f1;
-	padding: 8upx 0;
-	border-radius: 4upx;
-	width: 24%;
-	height: 32upx;
-	justify-content: center;
-	align-items: center;
-	position: relative;
-}
-
-.uni-filter .uni-filter-sel {
-	background-color: #c50200;
-	color: #ffffff;
-}
-
-/* .uni-filter .uni-filter-line {
-	position: absolute;
-	height: 4upx;
-	background: #f1f1f1;
-	top: 50%;
-	left: 0;
-	margin-top: -2upx;
-	width: 100%;
-} */
-
-.jz_agent .search {
-	margin-top: 8upx;
-}
-</style>

pages/user/myPoint/bankList.vue

@@ -1,227 +0,0 @@
-<template>
-	<view class="uni-flex uni-column address jz_address">
-
-		<view class="uni-flex addresslist uni-column" v-if="bankList.length>0">
-			<view class="addressitem uni-flex space-between align-items" v-for="(item,key) in bankList" :key="key">
-				<view class="itemleft uni-flex uni-column" style="width: 120upx; word-wrap:break-word;" @click="goOrder(item)">
-					<view class="lefNick" v-if="item.defaultVal">{{item.realName}}</view>
-					<view class="lefNick uni-flex align-items" v-if="!item.defaultVal">{{item.realName}}</view>
-					<view v-if="item.defaultVal" class="leftBtn">默认</view>
-				</view>
-				<view class="itemcenter uni-flex uni-column" @click="goOrder(item)">
-					<view class="centerPhone">{{item.bankNo}}</view>
-					<view class="centerAddress">{{item.bankName}}</view>
-				</view>
-				<view class="itemright uni-flex  justify-align-center">
-					<view class="uni-flex uni-column">
-						<text @click="goService(item)" class="uni-h5">编辑</text>
-						<text @click="del(item,key)" class="uni-h5">删除</text>
-					</view>
-					<view class="itemRt uni-flex justify-align-center" style="margin-left: 10upx;" v-if="url=='../order/order'" @click="goOrder(item)">
-						<uni-icon type="arrowright" size="20" color="#999999"></uni-icon>
-					</view>
-				</view>
-			</view>
-
-			<load-more :loadingType="loadingType" :contentText="contentText"></load-more>
-			<view @click="newService()" class="addBtn-wrap uni-flex justify-align-center" v-if="bankList.length>0">
-				<view class="addBtn uni-flex justify-align-center">新建银行信息</view>
-			</view>
-		</view>
-		<view class="uni-lists uni-flex justify-align-center uni-column" v-if="bankList.length==0">
-			<view class="addressImg uni-flex justify-align-center">
-				<image src="../../../static/address/08.png"></image>
-			</view>
-			<view class="noaddressTitle">1个银行信息也没有,</view>
-			<view class="noaddressTitle">快去添加吧</view>
-			<view @click="add()" class="addBtn-wrap uni-flex justify-align-center" v-if="bankList.length==0">
-				<view class="addBtn uni-flex justify-align-center">新建银行信息</view>
-			</view>
-		</view>
-
-	</view>
-</template>
-
-<script>
-	import {
-		mapState,
-		mapMutations
-	} from 'vuex'
-
-	import loadMore from '@/components/uni-load-more.vue';
-	import uniIcon from '../../../components/uni-icon/uni-icon.vue';
-	var index;
-	export default {
-		computed: {
-			...mapState(['hasLogin', 'forcedLogin', 'jyyUser'])
-		},
-		data() {
-			return {
-				user: {},
-				url: "",
-				integral: '',
-				bankList: [],
-				loadingType: 0,
-				contentText: {
-					contentdown: "上拉显示更多",
-					contentrefresh: "正在加载...",
-					contentnomore: "没有更多数据了"
-				}
-			};
-		},
-		onPullDownRefresh() {
-			this.init();
-			setTimeout(function() {
-				uni.stopPullDownRefresh();
-			}, 1000);
-		},
-		onShow() {
-			this.init();
-		},
-		onLoad(e) {
-			this.url = e.url;
-			this.integral = e.integral;
-			this.init();
-		},
-		methods: {
-			init() {
-				index = 1;
-				if (!this.hasLogin) {
-					uni.navigateTo({
-						url: '../login/login',
-					});
-				} else {
-					this.user = JSON.parse(this.jyyUser);
-					this.getData();
-				}
-			},
-			goOrder: function(e) {
-				if (this.url == undefined || this.url == "undefined") {
-					return false;
-				} else {
-					uni.redirectTo({
-						url: "cashOut?addressId=" + e.id + '&integral=' + this.integral
-					})
-				}
-			},
-			add() {
-				uni.redirectTo({
-					url: "bindBank?url=cashOut" + '&integral=' + this.integral
-				})
-			},
-			del(e, key) {
-				uni.showModal({
-					content: '确认删除？',
-					success: (res) => {
-						if (res.confirm) {
-							uni.showLoading({
-								title: "操作中"
-							})
-							uni.request({
-								url: this.webUrl + 'DelBank',
-								method: 'POST',
-								data: {
-									id: e.id,
-									userid: this.user.id
-								},
-								header: {
-									'content-type': 'application/x-www-form-urlencoded'
-								},
-								success: res => {
-									uni.hideLoading();
-									uni.showToast({
-										title: res.data.result.resultInfo,
-										icon: "none"
-									});
-									e.isDeleted = true;
-									this.bankList.splice(key, 1)
-								},
-								fail: () => {},
-								complete: () => {}
-							});
-						}
-					}
-				})
-			},
-			getData() {
-				if (this.loadingType !== 0) {
-					return;
-				}
-				this.loadingType = 1;
-				let user = JSON.parse(this.jyyUser);
-				uni.request({
-					url: this.webUrl + 'BankList',
-					method: 'POST',
-					data: {
-						pageIndex: index,
-						userid: user.id
-					},
-					header: {
-						'content-type': 'application/x-www-form-urlencoded'
-					},
-					success: res => {
-						if (res.data.result.bankList.length > 0) {
-							this.bankList = this.bankList.concat(res.data.result.bankList);
-						} else {
-							this.loadingType = 2;
-							return;
-						}
-						if (index == parseInt(res.data.result.pages)) {
-							this.loadingType = 2;
-							return;
-						} else {
-							this.loadingType = 0;
-						}
-						index++;
-					},
-					fail: () => {},
-					complete: () => {}
-				});
-			},
-			newService() {
-				uni.navigateTo({
-					// url: "bindBank?id=0",
-					url: "bindBank?integral=" + this.integral
-				})
-			},
-			goService: function(e) {
-				if (this.url == undefined) {
-					uni.navigateTo({
-						url: "bindBank?id=" + e.id + '&integral=' + this.integral
-					})
-				} else {
-					uni.redirectTo({
-						url: "bindBank?id=" + e.id + "&url=" + this.url + '&integral=' + this.integral
-					})
-				}
-
-			}
-		},
-		onReachBottom() {
-			this.getData();
-		},
-		components: {
-			loadMore,
-			uniIcon
-		}
-	}
-</script>
-<style>
-	page {
-		background: #FFFFFF;
-	}
-
-	.jz_address .addBtn {
-		background: url(../../../static/btn.png) no-repeat;
-		width: 550upx;
-		height: 115upx;
-		color: #FFFFFF;
-		font-size: 28upx;
-		margin: 0 auto;
-		background-size: 550upx 115upx;
-	}
-
-	.jz_address .addressitem .itemright {
-		margin: 0;
-	}
-</style>

pages/user/myPoint/bindBank.vue

@@ -1,248 +0,0 @@
-<template>
-	<view class="uni-flex jz_addressServer jz_bindBank">
-		<view class="uni-flex uni-flex-item  uni-common-mt uni-column">
-			<form class="uni-flex uni-flex-item uni-column form" @submit="formSubmit" @reset="formReset">
-				<view class="uni-flex  uni-row align-items">
-					<view class="uni-flex uni-flex-item">银行名称</view>
-					<view class="uni-flex uni-flex-item4 uni-form-item">
-						<input v-model="bankObj.bankName" class="uni-input" disabled name="bankName" placeholder="请选择银行" @click="showSinglePicker" />
-					</view>
-				</view>
-				<view class="uni-flex  uni-row align-items">
-					<view class="uni-flex uni-flex-item">开户地址</view>
-					<view class="uni-flex uni-flex-item4 uni-form-item">
-						<input v-model="bankObj.bankAddress" class="uni-input" name="bankAddress" placeholder="请输入地址" />
-					</view>
-				</view>
-				<view class="uni-flex uni-row align-items">
-					<view class="uni-flex uni-flex-item">开户姓名</view>
-					<view class="uni-flex uni-flex-item4 justify-align-center uni-form-item">
-						<input class="uni-input uni-flex-item" v-model="bankObj.realName" name="realName" placeholder="请输入收款人姓名" />
-						<view class="uni-flex justify-align-center">
-							<image src="../../../static/address/05.png" class="addPeopleImg"></image>
-						</view>
-					</view>
-				</view>
-				<view class="uni-flex  uni-row align-items">
-					<view class="uni-flex uni-flex-item">银行卡号</view>
-					<view class="uni-flex uni-flex-item4 uni-form-item"><input class="uni-input" v-model="bankObj.bankNo" name="bankNo"
-						 placeholder="请输入银行卡号" /></view>
-				</view>
-				<view class="spaceone"></view>
-				<view class="space"></view>
-				<view class="uni-flex  uni-row align-items">
-					<view class="uni-flex uni-flex-item4">设为默认</view>
-					<view class="uni-flex uni-flex-item">
-						<switch :checked="bankObj.defaultVal" @change="switch1Change" color="#e40001" />
-					</view>
-				</view>
-				<view class="uni-flex justify-align-center add"><button class="btn" formType="submit">⊕ 保存银行信息</button></view>
-			</form>
-
-		</view>
-		<mpvue-picker :themeColor="themeColor" ref="mpvuePicker" :mode="mode" :deepLength="deepLength" :pickerValueDefault="pickerValueDefault"
-		 @onConfirm="onConfirm" @onCancel="onCancel" :pickerValueArray="pickerValueArray"></mpvue-picker>
-	</view>
-</template>
-
-<script>
-	var graceChecker = require('../../../common/graceChecker.js');
-
-	import mpvuePicker from '../../../components/mpvue-picker/mpvuePicker.vue';
-	import {
-		mapState,
-		mapMutations
-	} from 'vuex';
-
-	export default {
-		data() {
-			return {
-				themeColor: '#007AFF',
-				integral: '',
-				pickerText: '',
-				mode: '',
-				address: {},
-				user: {},
-				url: '',
-				id: '',
-				pickerValueArray: [],
-				pickerSingleArray: [],
-				deepLength: 1,
-				pickerValueDefault: [0],
-				bankPickerText: '',
-				banks: [],
-				bankObj: {
-					bankName: '',
-					bankAddress: '',
-					realName: '',
-					bankNo: '',
-					defaultVal: false
-				}
-			};
-		},
-		components: {
-			mpvuePicker
-		},
-		computed: {
-			...mapState(['hasLogin', 'forcedLogin', 'jyyUser'])
-		},
-		methods: {
-			// 单列
-			showSinglePicker() {
-				let singleArray = []
-				for (var i = 0; i < this.banks.length; i++) {
-					singleArray.push({
-						label: this.banks[i].remark,
-						value: this.banks[i].value
-					})
-				}
-				this.pickerValueArray = singleArray;
-				this.mode = 'selector';
-				this.deepLength = 1;
-				this.$refs.mpvuePicker.show();
-			},
-			onConfirm(e) {
-				this.bankObj.bankName = e.label;
-			},
-			switch1Change: function(e) {
-				this.bankObj.defaultVal = e.target.value;
-			},
-			onCancel(e) {
-				//console.log(e)
-			},
-			formSubmit: function(e) {
-				var rule = [{
-						name: 'bankName',
-						checkType: 'notnull',
-						checkRule: '',
-						errorMsg: '请选择银行'
-					},
-					{
-						name: 'bankAddress',
-						checkType: 'notnull',
-						checkRule: '',
-						errorMsg: '请选择地区'
-					},
-					{
-						name: 'realName',
-						checkType: 'string',
-						checkRule: '2,15',
-						errorMsg: '请输入开户姓名'
-					},
-					{
-						name: 'bankNo',
-						checkType: 'notnull',
-						checkRule: '',
-						errorMsg: '请输入银行卡号'
-					}
-				];
-				//进行表单检查
-				var formData = e.detail.value;
-				var checkRes = graceChecker.check(formData, rule);
-				if (checkRes) {
-					uni.request({
-						url: this.webUrl + 'SaveBank',
-						method: 'POST',
-						data: {
-							bank: JSON.stringify(this.bankObj),
-							id: this.address.id,
-							userid: this.user.id
-						},
-						header: {
-							'content-type': 'application/x-www-form-urlencoded'
-						},
-						success: res => {
-							uni.hideLoading();
-							uni.showToast({
-								title: res.data.result.resultInfo,
-								icon: 'none'
-							});
-							if (res.data.result.isSuccess) {
-								if (this.url == undefined) {
-									this.url = 'bindBank'
-								}
-								uni.redirectTo({
-									url: 'bankList?url=' + this.url + '&integral=' + this.integral
-								});
-							}
-						},
-						fail: () => {},
-						complete: () => {}
-					});
-				} else {
-					uni.showToast({
-						title: graceChecker.error,
-						icon: 'none'
-					});
-				}
-			},
-			getBanks() {
-				uni.request({
-					url: this.webUrl + 'Banks',
-					method: 'POST',
-					header: {
-						'content-type': 'application/x-www-form-urlencoded'
-					},
-					success: res => {
-						this.banks = res.data.banks;
-					},
-					fail: () => {},
-					complete: () => {}
-				});
-			},
-			getData() {
-				uni.request({
-					url: this.webUrl + 'GetBank',
-					method: 'POST',
-					data: {
-						userid: this.user.id,
-						id: this.address.id
-					},
-					header: {
-						'content-type': 'application/x-www-form-urlencoded'
-					},
-					success: res => {
-						if (res.data.bank != null) {
-							this.bankObj = res.data.bank;
-						}
-					},
-					fail: () => {},
-					complete: () => {}
-				});
-			},
-			formReset: function(e) {
-				console.log('清空数据');
-				this.chosen = '';
-			}
-		},
-		onLoad(e) {
-			if (!this.hasLogin) {
-				uni.navigateTo({
-					url: '../login/login'
-				});
-			} else {
-				this.getBanks();
-				this.url = e.url;
-				this.user = JSON.parse(this.jyyUser);
-				this.integral = e.integral;
-				if (e.id == undefined) {
-					this.address.id = 0;
-					uni.setNavigationBarTitle({
-						title: '添加银行信息'
-					});
-				} else {
-					this.address.id = e.id;
-					uni.setNavigationBarTitle({
-						title: '修改银行信息'
-					});
-					this.getData();
-				}
-			}
-		},
-		onBackPress() {},
-		onUnload() {}
-	};
-</script>
-
-<style>
-</style>

pages/user/myPoint/cashOut.vue

@@ -1,249 +0,0 @@
-<template>
-	<view class="jz_myPoint uni-flex uni-column jz_addressServer jz_cashout">
-		<view class="myPint_header uni-flex uni-column">
-			<view class="t">账户积分</view>
-			<view class="p">{{integral}}</view>
-		</view>
-
-		<view class="uni-list uni-flex uni-column">
-			<view class="uni-list-cell " hover-class="uni-list-cell-hover" v-if="!showBank" @click="goBankList">
-				<view class="uni-list-cell-navigate uni-navigate-right">
-					<view class=" showBank">
-						{{bank.realName}} {{bank.bankName}} {{bank.bankNo}}
-					</view>
-				</view>
-			</view>
-			<view class="uni-list-cell " hover-class="uni-list-cell-hover" v-if="showBank" @click="goBindBank">
-				<view class="uni-list-cell-navigate uni-navigate-right">
-					<view class="uni-flex align-items">
-						<text style="margin-left: -8upx;">绑定银行</text>
-					</view>
-				</view>
-			</view>
-		</view>
-		<view class="myPint_pace"></view>
-		<view class="uni-flex uni-flex-item  uni-common-mt uni-column">
-			<form class="uni-flex uni-flex-item uni-column form" @submit="formSubmit" @reset="formReset">
-				<view class="uni-flex  uni-row align-items">
-					<view class="uni-flex uni-flex-item">到账方式</view>
-					<view class="uni-flex uni-flex-item4 uni-form-item">
-						<input :value="pickerText" class="uni-input" disabled name="time" placeholder="选择到账方式" @click="showSinglePicker" />
-					</view>
-				</view>
-				<view class="uni-flex uni-row align-items">
-					<view class="uni-flex uni-flex-item">提现金额</view>
-					<view class="uni-flex uni-flex-item4 justify-align-center uni-form-item">
-						<input class="uni-input uni-flex-item" v-model="amount" name="amount" placeholder="请输入提现金额" />
-					</view>
-				</view>
-				<view class="uni-flex  uni-row align-items">
-					<view class="uni-flex uni-flex-item">支付密码</view>
-					<view class="uni-flex uni-flex-item4 uni-form-item"><input class="uni-input" password v-model="password" name="password"
-						 placeholder="请输入支付密码" /></view>
-				</view>
-				<view class="uni-flex justify-align-center add" style="background: #FFFFFF;"><button class="btn" formType="submit">确认提现</button></view>
-			</form>
-
-		</view>
-		<mpvue-picker :themeColor="themeColor" ref="mpvuePicker" :mode="mode" :deepLength="deepLength" :pickerValueDefault="pickerValueDefault"
-		 @onConfirm="onConfirm" @onCancel="onCancel" :pickerValueArray="pickerValueArray"></mpvue-picker>
-	</view>
-</template>
-
-<script>
-	import {
-		mapState,
-		mapMutations
-	} from 'vuex'
-
-	var graceChecker = require('../../../common/graceChecker.js');
-	import mpvuePicker from '../../../components/mpvue-picker/mpvuePicker.vue';
-	export default {
-		computed: {
-			...mapState(['hasLogin', 'forcedLogin', 'jyyUser'])
-		},
-		data() {
-			return {
-				showBank: false,
-				pickerValueArray: [],
-				themeColor: '#007AFF',
-				pickerSingleArray: [],
-				mode: '',
-				deepLength: 1,
-				pickerValueDefault: [0],
-				pickerText: '',
-				backMoneys: [{
-						title: "2小时以内到账（2元手续费）",
-						id: 0
-					},
-					{
-						title: "24小时以内到账（1元手续费）",
-						id: 1
-					}
-				],
-				integral: '',
-				user: {},
-				bank: {},
-				withDraw: {
-					amount: '',
-					bank: ''
-				},
-				bankstr: '',
-				id: 0
-			}
-		},
-		components: {
-			mpvuePicker
-		},
-		onLoad(e) {
-			this.integral = e.integral;
-			this.user = JSON.parse(this.jyyUser);
-			if (e.addressId) {
-				this.id = e.addressId;
-			}
-			this.getData();
-		},
-		methods: {
-			formSubmit: function(e) {
-				var rule = [{
-						name: 'time',
-						checkType: 'notnull',
-						checkRule: '',
-						errorMsg: '请选择到账方式'
-					},
-					{
-						name: 'amount',
-						checkType: 'notnull',
-						checkRule: '',
-						errorMsg: '请输入提现金额'
-					},
-					{
-						name: 'password',
-						checkType: 'notnull',
-						checkRule: '',
-						errorMsg: '请输入支付密码'
-					}
-				];
-				//进行表单检查
-				var formData = e.detail.value;
-				var checkRes = graceChecker.check(formData, rule);
-				this.bankstr = this.bank.realName + ',' + this.bank.bankName + ',' + this.bank.bankAddress + ',' + this.bank.bankNo
-				this.withDraw.bank = this.bankstr;
-				this.withDraw.amount = this.amount;
-				this.amount = parseFloat(this.amount);
-				this.integral = parseFloat(this.integral);
-				if (checkRes) {
-					if (this.amount > 0) {
-						if (this.amount <= this.integral) {
-							uni.request({
-								url: this.webUrl + 'SaveWithDraw',
-								method: 'POST',
-								data: {
-									withDraw: JSON.stringify(this.withDraw),
-									userid: this.user.id
-								},
-								header: {
-									'content-type': 'application/x-www-form-urlencoded'
-								},
-								success: res => {
-									uni.hideLoading();
-
-									if (res.data.result.isSuccess) {
-										uni.showToast({
-											title: res.data.result.resultInfo,
-											icon: 'none'
-										});
-										// uni.redirectTo({
-										// 	url: 'bankList?url=' + this.url
-										// });
-									} else {
-										uni.showToast({
-											title: res.data.result.resultInfo,
-											icon: 'none'
-										});
-									}
-								},
-								fail: () => {},
-								complete: () => {}
-							});
-						} else {
-							uni.showToast({
-								icon: "none",
-								title: "积分不足"
-							})
-						}
-
-					} else {
-						uni.showToast({
-							icon: "none",
-							title: "提现金额必须大于0"
-						})
-					}
-				} else {
-					uni.showToast({
-						title: graceChecker.error,
-						icon: 'none'
-					});
-				}
-
-
-
-			},
-			getData() {
-				uni.request({
-					url: this.webUrl + 'WithDraw',
-					data: {
-						userid: this.user.id,
-						id: this.id
-					},
-					method: 'POST',
-					header: {
-						'content-type': 'application/x-www-form-urlencoded'
-					},
-					success: res => {
-						if (res.data.bank == null) {
-							this.showBank = true;
-						} else {
-							this.bank = res.data.bank;
-						}
-					},
-					fail: () => {},
-					complete: () => {}
-				});
-			},
-			goBankList() {
-				uni.redirectTo({
-					url: "bankList?url=cashOut&integral=" + this.integral
-				})
-			},
-			goBindBank() {
-				uni.redirectTo({
-					url: "bindBank?url=cashOut&integral=" + this.integral
-				})
-			},
-			onCancel(e) {
-				console.log(e)
-			},
-			onConfirm(e) {
-				this.pickerText = e.label;
-			},
-			// 单列
-			showSinglePicker() {
-				let singleArray = []
-				for (var i = 0; i < this.backMoneys.length; i++) {
-					singleArray.push({
-						label: this.backMoneys[i].title,
-						value: this.backMoneys[i].id
-					})
-				}
-				this.pickerValueArray = singleArray;
-				this.mode = 'selector';
-				this.deepLength = 1;
-				this.$refs.mpvuePicker.show();
-			},
-		}
-	}
-</script>
-
-<style>
-</style>

pages/user/myPoint/income.vue

@@ -1,217 +0,0 @@
-<template>
-	<view class="jz_income uni-flex uni-column">
-		<view class="item_top uni-flex justify-align-center">
-			<view class="dataBtn uni-flex justify-align-center" @click="onShowDatePicker('rangetime')">
-				<view class="date"> {{range[0]}} - {{range[1]}}</view>
-				<image src="../../../static/income/03.png"></image>
-			</view>
-		</view>
-		<view class="income_item uni-flex uni-column">
-
-			<view class="income_space"></view>
-			<view class="content_list uni-flex uni-column">
-				<view class="content_item_wrap">
-					<view class="content_item uni-flex space-between align-items" v-for="(item, key) in moneyLogList" :key="key">
-						<view class="item_lf uni-flex align-items">
-							<view class="uni-flex justify-align-center lef-img">
-								<image src="../../../static/income.png"></image>
-							</view>
-							<view class="item_titles uni-flex space-between uni-column">
-								<view class="bankMsg">{{item.bank}}</view>
-								<view class="uni-flex">
-									<view class="orderNo ">{{item.withDrawNo}}</view>
-								</view>
-								<view class="">{{item.createDate}}</view>
-							</view>
-						</view>
-
-						<view class="item_rt uni-flex  justify-align-center">
-							<view class="uni-flex uni-column">
-								<view>￥{{item.amount}}</view>
-								<view v-if="item.state==0" style="color: #666666;text-align: right;">待处理</view>
-								<view v-if="item.state==1" style="color: #666666;text-align: right;">已处理</view>
-							</view>
-						</view>
-					</view>
-				</view>
-
-			</view>
-
-		</view>
-		<load-more :loadingType="loadingType" :contentText="contentText"></load-more>
-		<mx-date-picker :show="showPicker" :type="type" :value="value" :show-tips="true" :begin-text="'开始'" :end-text="'结束'"
-		 :show-seconds="true" @confirm="onSelected" @cancel="onSelected" />
-	</view>
-</template>
-<script>
-	import {
-		mapState,
-		mapMutations
-	} from 'vuex'
-
-	import MxDatePicker from "@/components/mx-datepicker/mx-datepicker.vue";
-	import util from '../../../common/util.js'
-	import loadMore from '@/components/uni-load-more.vue';
-	import backTop from '@/components/uni-top.vue';
-	import uniIcon from '../../../components/uni-icon.vue';
-
-	var index;
-	var date = new Date();
-	var range = util.getMonthFirstLastDay(date.getFullYear(), date.getMonth() + 1);
-	export default {
-		components: {
-			MxDatePicker,
-			loadMore,
-			backTop,
-			uniIcon
-		},
-		computed: {
-			...mapState(['hasLogin', 'forcedLogin', 'jyyUser'])
-		},
-		data() {
-			return {
-				loadingType: 0,
-				contentText: {
-					contentdown: "上拉显示更多",
-					contentrefresh: "正在加载...",
-					contentnomore: "没有更多数据了"
-				},
-				backTop: {
-					"src": "../../static/top.png",
-					"scrollTop": 0
-				},
-				user: {},
-				moneyLogList: [],
-				showPicker: false,
-				type: 'rangetime',
-				range: range,
-				value: ''
-			}
-		},
-		onLoad() {
-			if (!this.hasLogin) {
-				uni.navigateTo({
-					url: '../login/login',
-				});
-			} else {
-				index = 1;
-				this.user = JSON.parse(this.jyyUser);
-				this.getData();
-			}
-
-		},
-		onPullDownRefresh() {
-			this.getData();
-			setTimeout(function() {
-				uni.stopPullDownRefresh();
-			}, 1000);
-		},
-		onReachBottom() {
-			this.getData();
-		},
-		methods: {
-			goProduct(e) {
-				uni.navigateTo({
-					url: 'product?id=' + e.id + '&userid=' + this.user.id
-				})
-			},
-			getData() {
-				if (this.loadingType !== 0) {
-					return;
-				}
-				uni.request({
-					url: this.webUrl + 'WithDrawList',
-					method: 'POST',
-					header: {
-						'content-type': 'application/x-www-form-urlencoded'
-					},
-					data: {
-						userid: this.user.id,
-						PageIndex: index,
-						begin: this.range[0],
-						end: this.range[1],
-					},
-					success: res => {
-						if (res.data.result.bankList.length > 0) {
-							this.moneyLogList = this.moneyLogList.concat(res.data.result.bankList);
-						} else {
-							this.loadingType = 2;
-							return;
-						}
-						if (index == parseInt(res.data.result.pages)) {
-							this.loadingType = 2;
-							return;
-						} else {
-							this.loadingType = 0;
-						}
-						index++;
-					},
-					fail: () => {},
-					complete: () => {}
-				});
-			},
-			onShowDatePicker(type) { //显示
-				this.type = type;
-				this.showPicker = true;
-				this.value = this[type];
-			},
-			onSelected(e) { //选择
-				this.showPicker = false;
-				if (e) {
-					this.range[0] = util.formatDate(e.value[0], "YY-MM-DD");
-					this.range[1] = util.formatDate(e.value[1], "YY-MM-DD");
-					index = 1;
-					this.loadingType = 0;
-					this.moneyLogList = [];
-					this.getData();
-				}
-			}
-		}
-	}
-</script>
-
-
-<style>
-	.rtLine {
-		color: #999999;
-		margin-left: 30upx;
-	}
-
-	page {
-		height: auto;
-	}
-
-	.jz_income .mescroll-uni.mescroll-uni-fixed {
-		position: static;
-	}
-
-	.jz_income .orderNo {
-		width: 300upx;
-		overflow: hidden;
-		white-space: nowrap;
-		text-overflow: ellipsis;
-	}
-
-	.jz_income .orderNoTitle {
-		width: 110upx;
-	}
-
-	.jz_income .bankMsg {
-		width: 450upx;
-		overflow: hidden;
-		text-overflow: ellipsis;
-		white-space: nowrap;
-	}
-
-	.jz_income .item_rt {
-		margin-right: 18upx;
-	}
-
-	.jz_income .content_item {
-		margin-left: 0upx;
-	}
-
-	.jz_income .orderNo {
-		width: 450upx;
-	}
-</style>

pages/user/myPoint/myPoint.vue

@@ -1,56 +0,0 @@
-<template>
-	<view class="jz_myPoint uni-flex uni-column">
-		<view class="myPint_header uni-flex uni-column">
-			<view class="t">账户积分</view>
-			<view class="p">{{integral}}</view>
-		</view>
-
-		<view class="uni-list uni-flex uni-column">
-			<view class="uni-list-cell " hover-class="uni-list-cell-hover" @click="goCashOut">
-				<view class="uni-list-cell-navigate uni-navigate-right">
-					<view class="uni-flex align-items">
-						<image src="../../../static/img01.png"></image>
-						<text>申请提现</text>
-					</view>
-				</view>
-			</view>
-			<view class="uni-list-cell " hover-class="uni-list-cell-hover" @click="goDetail">
-				<view class="uni-list-cell-navigate uni-navigate-right">
-					<view class="uni-flex align-items">
-						<image src="../../../static/img02.png"></image>
-						<text>提现明细</text>
-					</view>
-				</view>
-			</view>
-		</view>
-		<view class="myPint_pace"></view>
-	</view>
-</template>
-
-<script>
-	export default {
-		data() {
-			return {
-				integral: ''
-			}
-		},
-		onLoad(e) {
-			this.integral = e.integral;
-		},
-		methods: {
-			goCashOut() {
-				uni.navigateTo({
-					url: 'cashOut?integral='+this.integral
-				})
-			},
-			goDetail() {
-				uni.navigateTo({
-					url: 'income'
-				})
-			}
-		}
-	}
-</script>
-
-<style>
-</style>

pages/user/myuser/myfit.vue

@@ -1,565 +0,0 @@
-<template>
-	<view class="uni-flex lists jz_lists uni-column jz_myfit jz_agent  ">
-		<view class="tab-search uni-column">
-			<view class="tabList">
-				<scroll-view class="uni-flex uni-swiper-tab" scroll-x :scroll-left="scrollLeft" id="tab-bars">
-					<view v-for="(tab, i) in categorys" :key="i" class="swiper-tab-list" :id="'tab' + tab.id" :data-current="index"
-					 @click="changeTab(i, tab)">
-						<view class="productTitle-item uni-flex uni-column">
-							<image :src="tab.ico"></image>
-							<view :class="['picname', curIndex == i ? 'activeLine' : '']">{{ tab.title }}</view>
-						</view>
-					</view>
-				</scroll-view>
-				<view  style="height: 10upx;background: #F4F5F6;width: 100%;"></view>
-			</view>
-			<view class="search uni-flex ">
-				<!-- :class="[sortNavfixed ? 'fixed' : '']" -->
-				<view class="uni-flex-item uni-flex search-input">
-					<input placeholder="关键词" @input="inputChange" v-model="key" :focus="isFocus" @focus="focus" @blur="blur" class="uni-flex-item" />
-					<icon v-if="isDelShow" class="icon icon-del" @click.stop="clear" type="clear" size="12"></icon>
-				</view>
-
-				<view class="searchBtn uni-flex justify-align-center" @click="search">
-					<image src="../../../static/search02.png"></image>
-					<text>搜索</text>
-				</view>
-			</view>
-		</view>
-
-		<view class="agent-product uni-flex uni-column" id="list">
-			<view class=" uni-flex uni-row uni-flex-item myfit-product" v-for="(item, key) in products" :key="key">
-				<view class="uni-flex product-img justify-align-center">
-					<image class="image" :class="{ lazy: !item.display }" :id="'lazy' + key" :data-index="0" @load="imageOnLoad(item, key)"
-					 :src="item.display ? item.pic : ''" style="left: 0;top: 0;"/>
-					<view class="loadbox" :class="{loaded:item.loaded}" style="left: 0;top: 0;">
-						<view class="load"></view>
-					</view>
-				</view>
-				<view class="uni-flex  uni-column space-between product-contents">
-					<view class="uni-flex title">{{item.title}}</view>
-					<view class="prices uni-flex uni-flex">
-						<view class="uni-flex">我的:{{item.costPrice}}元/{{item.unit}}</view>
-						<view class="uni-flex">代理:{{item.salePrice}}元/{{item.unit}}</view>
-					</view>
-					<view class="uni-flex fen">
-						分润:<text>{{item.share}}</text>元/瓶
-					</view>
-					<view class="myfit-slider uni-flex align-items" @touchstart="setKey(key)">
-						<slider :id="key" style="width: 100%;" :value="item.ratio" @change="sliderChange" show-value backgroundColor="#f5f5f7"
-						 activeColor="#ed0000" block-size="24" />
-						<view>%</view>
-					</view>
-
-				</view>
-			</view>
-		</view>
-
-		<load-more :loadingType="loadingType" :contentText="contentText"></load-more>
-		<backTop :src="backTop.src" :scrollTop="backTop.scrollTop"></backTop>
-
-	</view>
-</template>
-
-<script>
-	import {
-		mapState,
-		mapMutations
-	} from 'vuex';
-
-	import util from '../../../common/util.js';
-	import loadMore from '@/components/uni-load-more.vue';
-	import backTop from '@/components/uni-top.vue';
-	var index;
-	export default {
-		components: {
-			loadMore,
-			backTop
-		},
-		data() {
-			return {
-				loadingType: 0,
-				contentText: {
-					contentdown: "上拉显示更多",
-					contentrefresh: "正在加载...",
-					contentnomore: "没有更多数据了"
-				},
-				item: {},
-				showSlider: false,
-				sliderIndex: 0,
-				items: [{}, {}, {}],
-				user: {},
-				userid: 0,
-				active: false,
-				isDelShow: false,
-				isFocus: false,
-				sortNavfixed: false,
-				show: false,
-				windowHeight: 0,
-				type: 0,
-				cates: [{
-					css: '',
-					id: '0',
-					no: '000',
-					show: '0',
-					subs: [],
-					title: '全部'
-				}],
-				categorys: [{
-					ico: '../../../static/merchant/all.png',
-					id: '000',
-					no: '000',
-					title: '全部'
-				}],
-				category: {},
-				products: [],
-				product: {
-					ratio: 0
-				},
-				productKey: 0,
-				curIndex: 0,
-				key: '',
-				id: '000',
-				clock: 0,
-				scrollLeft: 0,
-				backTop: {
-					"src": "../../static/top.png",
-					"scrollTop": 0
-				}
-			};
-		},
-		computed: {
-			...mapState(['hasLogin', 'forcedLogin', 'jyyUser'])
-		},
-		onLoad(e) {
-			index = 1;
-			if (!this.hasLogin) {
-				uni.navigateTo({
-					url: '../login/login',
-				});
-			} else {
-				this.windowHeight = uni.getSystemInfoSync().windowHeight;
-				this.user = JSON.parse(this.jyyUser);
-				this.userid = e.userid;
-				this.getCategory();
-				this.getData();
-				if (e.n > 4) {
-					setTimeout(() => {
-						this.public(e.n, e);
-					}, 200);
-				}
-			}
-		},
-		onPageScroll(e) {
-			this.backTop.scrollTop = e.scrollTop;
-			util.loads(this.products, 'list', this.windowHeight);
-			uni.createSelectorQuery()
-				.selectAll('#list')
-				.boundingClientRect(datas => {
-					this.sortNavfixed = parseInt(datas[0].top) < 78 ? true : false;
-				})
-				.exec();
-		},
-		onPullDownRefresh() {
-			this.getData();
-			setTimeout(function() {
-				uni.stopPullDownRefresh();
-			}, 1000);
-		},
-		onReachBottom() {
-			this.getData();
-		},
-		methods: {
-			setKey(e) {
-				this.sliderIndex = e;
-			},
-			hidesliderPopup() {
-				this.showSlider = false;
-			},
-			set(productId, ratio, share) {
-				uni.request({
-					url: this.webUrl + 'SetUserRatio',
-					method: 'POST',
-					header: {
-						'content-type': 'application/x-www-form-urlencoded'
-					},
-					data: {
-						userid: this.user.id,
-						setid: this.userid,
-						productId: productId,
-						price: share,
-						ratio: ratio.toFixed(2)
-					},
-					success: res => {
-						uni.showLoading({
-							title: res.data.result.resultInfo,
-							icon: "none"
-						});
-						setTimeout(function() {
-							uni.hideLoading();
-						}, 500);
-					},
-					fail: () => {
-						mescroll.endErr();
-					},
-					complete: () => {}
-				});
-			},
-			sliderChange(e) {
-				let index;
-				// #ifndef H5
-				index = e.currentTarget.id;
-				// #endif
-				// #ifdef H5
-				index = this.sliderIndex;
-				// #endif
-				this.products[index].share = parseFloat((this.products[index].salePrice - this.products[index].costPrice) * e.detail.value /
-					100).toFixed(3);
-				this.set(this.products[index].id, e.detail.value / 100, this.products[index].share);
-			},
-			focus() {
-				this.active = true;
-				//HM修改 增加获取焦点判断
-				if (this.key != '') {
-					this.isDelShow = true;
-				}
-			},
-			inputChange(event) {
-				var keyword = event.detail.value;
-				this.$emit('input', keyword);
-				if (this.key) {
-					this.isDelShow = true;
-				}
-			},
-			blur() {
-				this.isFocus = false;
-				if (!this.key) {
-					this.active = false;
-				}
-			},
-			clear() {
-				//HM修改 收起键盘
-				uni.hideKeyboard();
-				this.isFocus = false;
-				this.key = '';
-				this.active = false;
-				//HM修改 清空内容时候触发组件input
-				this.isDelShow = false;
-			},
-			search() {
-				index = 1;
-				this.loadingType = 0;
-				this.products = [];
-				this.getData();
-			},
-			getData() {
-				if (this.loadingType !== 0) {
-					return;
-				}
-				uni.request({
-					url: this.webUrl + 'List',
-					method: 'POST',
-					header: {
-						'content-type': 'application/x-www-form-urlencoded'
-					},
-					data: {
-						pageNum: index,
-						id: this.id,
-						userid: this.user.id,
-						key: this.key,
-						setid: this.userid
-					},
-					success: res => {
-						if (res.data.result.ratioProducts.length > 0) {
-							this.products = this.products.concat(res.data.result.ratioProducts);
-							setTimeout(() => {
-								util.loads(this.products, 'list', this.windowHeight);
-							}, 500)
-						} else {
-							this.loadingType = 2;
-							return;
-						}
-						if (index == parseInt(res.data.result.pages)) {
-							this.loadingType = 2;
-							return;
-						} else {
-							this.loadingType = 0;
-						}
-						index++;
-					},
-					fail: () => {},
-					complete: () => {}
-				});
-			},
-			getElSize(id) {
-				//得到元素的size
-				return new Promise((res, rej) => {
-					uni.createSelectorQuery()
-						.select('#' + id)
-						.fields({
-								size: true,
-								scrollOffset: true
-							},
-							data => {
-								res(data);
-							}
-						)
-						.exec();
-				});
-			},
-			async public(i, e) {
-				this.id = e.no;
-				let index = i;
-				let tabBars = await this.getElSize('tab-bars'),
-					tabBarScrollLeft = tabBars.scrollLeft; //点击的时候记录并设置scrollLeft
-				let width = 0;
-				for (let j = 0; j < index; j++) {
-					let result = await this.getElSize('tab' + this.categorys[j].id);
-					width += result.width;
-				}
-				let winWidth = uni.getSystemInfoSync().windowWidth,
-					nowElement = await this.getElSize('tab' + this.categorys[index].id),
-					nowWidth = nowElement.width;
-				if (width + nowWidth - tabBarScrollLeft > winWidth - nowWidth) {
-					this.scrollLeft = width + nowWidth * 3 - winWidth;
-				}
-
-				if (width < tabBarScrollLeft) {
-					this.scrollLeft = width;
-				}
-			},
-			changeTab(i, e) {
-				if (this.curIndex === i) {
-					return false;
-				} else {
-					this.public(i, e);
-					this.isClickChange = true;
-					this.curIndex = i;
-					index = 1;
-					this.loadingType = 0;
-					this.products = [];
-					this.getData();
-					setTimeout(() => {
-						util.loads(this.products, 'list', this.windowHeight);
-					}, 500)
-
-				}
-			},
-			imageOnLoad(e) {
-				e.loaded = true;
-			},
-			getCategory() {
-				uni.request({
-					url: this.webUrl + 'Categorys',
-					method: 'POST',
-					header: {
-						'content-type': 'application/x-www-form-urlencoded'
-					},
-					success: res => {
-						this.cates = this.cates.concat(res.data.result.uniClassifys);
-						this.categorys = this.categorys.concat(res.data.result.categorys);
-					},
-					fail: () => {},
-					complete: () => {}
-				});
-			},
-			goAgentPriduct: function(e) {
-				uni.navigateTo({
-					url: 'product?id=' + e.id
-				});
-			}
-		}
-	};
-</script>
-
-<style>
-	.tab-search {
-		position: fixed;
-		width: 100%;
-		z-index: 9999;
-	}
-
-	.jz_myfit.jz_lists scroll-view.uni-swiper-tab {
-		margin-bottom: 0;
-	}
-
-	
-
-	/* #ifdef H5 */
-	.myfit-slider input {
-		display: block;
-		text-align: center;
-		width: 200upx;
-		background: #dd0101;
-		color: #FFFFFF;
-		border-radius: 30upx;
-		font-size: 26upx;
-	}
-
-	.myfit-slider>view:last-child {
-		margin-right: 10upx;
-	}
-
-	/* #endif */
-
-
-	slider {
-		display: inline;
-		margin-left: 0;
-		margin-right: 0;
-	}
-
-	.jz_agent.jz_myfit .agent-product {
-		margin-top: 300upx;
-	}
-
-	.fixed {
-		width: 100%;
-		position: fixed;
-		left: 0;
-		top: 0;
-		/* #ifdef H5 */
-		/* top: 84upx; */
-		top: 44px;
-		/* #endif */
-		background: #ffffff;
-		margin: 0 !import;
-		z-index: 999;
-		box-sizing: border-box;
-		border-bottom: 2upx solid #eeeeee;
-		transform: translateZ(0);
-		-webkit-transform: translateZ(0);
-	}
-
-	.activeLine {
-		border-bottom: 2upx solid #ff273c;
-	}
-
-	.jz_lists {
-		position: relative;
-	}
-
-
-	.jz_lists scroll-view.uni-swiper-tab {
-		border-bottom: 0;
-		height: auto;
-		line-height: auto;
-		padding-top: 20upx;
-	}
-
-	.jz_lists .productTitle-item {
-		justify-content: center;
-		align-items: center;
-	}
-
-	.jz_lists .productTitle-item .picname {
-		line-height: 60upx;
-	}
-
-	.jz_lists .productTitle-item image {
-		width: 50upx;
-		height: 50upx;
-	}
-
-	.lists .sortNav .Nav:first-child {
-		/* border-left: none; */
-	}
-
-	.list .tab-bar-wrap {
-		width: 200upx;
-	}
-
-	::-webkit-scrollbar {
-		display: none;
-	}
-
-	.lists .nav-left {
-		width: 218upx;
-		border-right: solid 1upx #e0e0e0;
-		padding-top: 20upx;
-		box-sizing: border-box;
-	}
-
-	.lists .nav-left .nav-left-title {
-		height: 80upx;
-		font-weight: 600;
-		margin: 0 auto;
-		margin-left: 10upx;
-	}
-
-	.lists .nav-left-item {
-		height: 110upx;
-		font-size: 30upx;
-		display: flex;
-		align-items: center;
-		justify-content: center;
-	}
-
-	.lists .nav-left-item image {
-		width: 40upx;
-		height: 40upx;
-		margin-right: 18upx;
-	}
-
-	.lists .nav-right {
-		width: 100%;
-		box-sizing: border-box;
-	}
-
-	.uni-tab-bar-loading {
-		width: 100%;
-	}
-
-	.uni-tab-bar-loading .loading-text {
-		margin-top: 50upx;
-		font-size: 28upx;
-		text-align: center;
-	}
-
-	.lists .list {
-		width: 100%;
-		height: 92%;
-	}
-
-
-	#tab-bar {
-		background-color: #ffffff;
-		padding-bottom: 60upx;
-		overflow: hidden;
-	}
-
-	.uni-tab-bar .active {
-		color: #ffe200;
-		/* border-left: 10upx solid #ffe200; */
-	}
-
-
-	.prices .prices-cart image {
-		width: 52upx;
-		height: 50upx;
-		margin-right: 10upx;
-	}
-
-	.prices .prices-salePrice {
-		font-size: 22upx;
-		color: #f00000;
-	}
-
-
-	.image {
-		position: absolute;
-		width: 100%;
-		height: 100%;
-	}
-
-
-	.list-collapse {
-		padding-left: 36upx;
-		box-sizing: border-box;
-	}
-
-
-	.lists .sortNav .navActive {
-		color: #d80000;
-	}
-</style>

pages/user/myuser/mymember.vue

@@ -1,142 +0,0 @@
-<template>
-	<view class="uni-flex uni-column jz_mymember">
-
-		<view class="uni-flex align-items menberItem" v-if="users.length>0" v-for="(item,key) in users" :key="key">
-			<view class="uni-flex justify-align-center menberItemImg">
-				<image v-if="item.headIco!=null&& item.headIco!='undefined'" :src="item.headIco"></image>
-				<image v-if="item.headIco==null|| item.headIco=='undefined'" src="../../../static/home/home12.png"></image>
-			</view>
-			<view class="uni-flex-item uni-flex space-between uni-column menberItemright">
-				<view class="uni-flex align-items">昵称：{{item.nickName}}</view>
-				<view class="uni-flex space-between align-items">
-					<view class="">注册时间：{{item.createDate}}</view>
-				</view>
-				<view class="uni-flex  align-items" v-if="user.business==1">
-					<view class="uni-flex justify-align-center btnmember btn " @click="goMyfit(item,key)">
-						推广分润设置
-					</view>
-					<view class="uni-flex justify-align-center btnmember btn" :class="[item.agency? '' : 'NoactiveClass']" @click="setAcentPrice(item,key)">
-						代理价格可见
-					</view>
-				</view>
-			</view>
-		</view>
-
-		<view class="uni-flex align-items menberItem" v-if="users.length==0" style="color: #B2B2B2;">
-			暂无会员
-		</view>
-
-
-	</view>
-</template>
-
-<script>
-	import {
-		mapState,
-		mapMutations
-	} from 'vuex'
-
-	export default {
-		computed: {
-			...mapState(['hasLogin', 'forcedLogin', 'jyyUser'])
-		},
-		data() {
-			return {
-				users: [],
-				user: {}
-			}
-		},
-		onShow() {},
-		onLoad(e) {
-
-			this.user = JSON.parse(this.jyyUser);
-			this.init();
-		},
-		methods: {
-			setAcentPrice(item, key) {
-				uni.request({
-					url: this.webUrl + 'SetAgency',
-					method: 'POST',
-					data: {
-						userid: this.user.id,
-						id: item.id,
-						agency: !item.agency
-					},
-					header: {
-						'content-type': 'application/x-www-form-urlencoded'
-					},
-					success: res => {
-						if (res.data.result.isSuccess) {
-							this.users[key].agency = !item.agency;
-						}
-					},
-					fail: () => {},
-					complete: () => {}
-				});
-			},
-			goMyfit(e) {
-				uni.navigateTo({
-					url: 'myfit?userid=' + e.id
-				})
-			},
-			init() {
-				if (!this.hasLogin) {
-					uni.navigateTo({
-						url: '../login/login',
-					});
-				} else {
-					this.getData();
-				}
-			},
-			getData() {
-				uni.request({
-					url: this.webUrl + 'GetMyUser',
-					method: 'POST',
-					data: {
-						userid: this.user.id,
-					},
-					header: {
-						'content-type': 'application/x-www-form-urlencoded'
-					},
-					success: res => {
-						if (res.data.data.length > 0) {
-							this.users = res.data.data;
-						}
-					},
-					fail: () => {},
-					complete: () => {}
-				});
-			},
-			goBuyUser(e) {
-				uni.navigateTo({
-					url: "./myuser?rank=" + e
-				})
-			}
-		}
-	}
-</script>
-<style>
-	.myuser {
-		height: 80upx;
-		text-align: center;
-		line-height: 80upx;
-	}
-
-	.mymember .number {
-		margin-right: 20upx;
-	}
-
-	.btnmember {
-		font-size: 24upx;
-		margin-top: 20upx;
-		width: 180upx;
-		height: 50upx;
-		border-radius: 8upx;
-		color: #fff;
-		line-height: 50upx;
-	}
-
-	.btnmember.NoactiveClass {
-		background: #cdcdcd;
-	}
-</style>

pages/user/myuser/myuser.vue

@@ -1,115 +0,0 @@
-<template>
-	<view class="uni-flex uni-column myuser">
-		<view class="uni-list">
-			<view class="content">
-				<view v-for="(item,key) in users" :key="key" class="uni-flex justify-content">
-					<view class="uni-product uni-flex">
-						<view class="image-view">
-							<image v-if="item.avatarUrl" class="uni-product-image" :src="item.avatarUrl" />
-							<image v-if="!item.avatarUrl" class="uni-product-image"  src="../../../static/user/28.jpg" />
-						</view>
-						<view class="uni-product-wrap uni-flex uni-column">
-							<view class="nick">昵称：<text>{{item.nickName}}</text></view>
-							<view class="registerTime">注册时间：<text>{{item.createDate}}</text></view>
-						</view>
-					</view>
-				</view>
-			</view>
-		</view>
-		<load-more :loadingType="loadingType" :contentText="contentText"></load-more>
-	</view>
-</template>
-
-<script>
-	import {
-		mapState,
-		mapMutations
-	} from 'vuex'
-	import loadMore from '@/components/uni-load-more.vue';
-	var index;
-	export default {
-		computed: {
-			...mapState(['hasLogin', 'forcedLogin', 'jyyUser'])
-		},
-		data() {
-			return {
-				users: [],
-				rank: 1,
-				ico:"../",
-				loadingType: 0,
-				contentText: {
-					contentdown: "上拉显示更多",
-					contentrefresh: "正在加载...",
-					contentnomore: "没有更多数据了"
-				}
-			};
-		},
-		onPullDownRefresh() {
-			this.init();
-			setTimeout(function() {
-				uni.stopPullDownRefresh();
-			}, 1000);
-		},
-		onShow() {
-			this.init();
-		},
-		onLoad(e) {
-			this.rank = e.rank;
-			this.init();
-		},
-		methods: {
-			init() {
-				index = 1;
-				if (!this.hasLogin) {
-					uni.navigateTo({
-						url: '../login/login',
-					});
-				} else {
-					this.getData();
-				}
-			},
-			getData() {
-				if (this.loadingType !== 0) {
-					return;
-				}
-				this.loadingType = 1;
-				let user = JSON.parse(this.jyyUser);
-				uni.request({
-					url: this.webUrl + 'MyUserList',
-					method: 'POST',
-					data: {
-						pageIndex: index,
-						userid: user.id,
-						rank: this.rank
-					},
-					header: {
-						'content-type': 'application/x-www-form-urlencoded'
-					},
-					success: res => {
-						if (res.data.result.userList.length > 0) {
-							this.users = this.users.concat(res.data.result.userList);
-						} else {
-							this.loadingType = 2;
-							return;
-						}
-						if (index == parseInt(res.data.result.pages)) {
-							this.loadingType = 2;
-							return;
-						} else {
-							this.loadingType = 0;
-						}
-						index++;
-					},
-					fail: () => {},
-					complete: () => {}
-				});
-			},
-		},
-		onReachBottom() {
-			this.getData();
-		},
-		components: {
-			loadMore
-		}
-	}
-</script>

pages/user/order/order.vue

@@ -1,508 +0,0 @@
-<template>
-	<view class="uni-flex uni-column cart order jz_order">
-		<view class="uni-flex uni-column uni-flex-item ">
-
-			<view v-if="!mode" class="order-address">
-				<view class="order-address-box01">
-					<view class="order-address-ico">
-						<image src="../../../static/cart/location.png"></image>
-					</view>
-					<view v-if="showAddress" class="order-message" @click="goAddress">
-						<view>
-							<view>
-								<view class="lf">收货人：{{address.nickName}}</view>
-								<view class="rt">电话：{{address.mobile}}</view>
-							</view>
-							<view class="address">收货地址：{{province}}{{city}}{{district}}{{address.addStr}}</view>
-						</view>
-					</view>
-					<view v-if="!showAddress" class="addAdress" @click="goAddressService">
-						<text>添加地址</text>
-					</view>
-
-					<view class="order-address-ico2" @click="goAddress">
-						<image src="../../../static/cart/image.png"></image>
-					</view>
-
-				</view>
-				<view class=" order-address-line01">
-					<image src="../../../static/cart/line.png"></image>
-				</view>
-			</view>
-
-			<view v-if="mode" class="order-address">
-				<view class=" order-address-box">
-					<view class="">收货信息</view>
-					<view class="expressMsg fontWnormal">
-						{{addressStr}}
-					</view>
-				</view>
-				<view class="uni-flex uni-flex-item order-address-line mg">
-					<image src="../../../static/cart/line.png"></image>
-				</view>
-			</view>
-
-			<!-- 列表循环 -->
-			<view class="uni-flex uni-column uni-flex-item cart-list" v-for="(item,m) in json" :key="m">
-				<view class="uni-flex uni-column item-shop ">
-					<!-- 商家 -->
-					<!-- <view class="uni-flex uni-row  order-line">
-						{{item.sj}}
-					</view> -->
-					<!-- 图片产品名称价格数量展示 -->
-					<view class="uni-flex uni-row order-item" v-for="(pl,n) in json[m].items" :key="n">
-						<!-- 商品图片 -->
-						<view class="uni-flex uni-flex-item  item-img">
-							<image mode="widthFix" :src="pl.img"></image>
-						</view>
-						<view class="uni-flex uni-column item-padding uni-flex-item3">
-							<view class="uni-flex uni-flex-item fontWnormal">
-								{{pl.cp}}
-							</view>
-							<view class="uni-flex uni-flex-item">
-								<view class="uni-flex text cart-attr" v-for="attr in pl.attr" :key="attr">
-									{{attr.name}}：{{attr.value}}
-								</view>
-							</view>
-							<view class="uni-flex uni-row uni-flex-item">
-								<view class="uni-flex uni-flex-item5" v-if="status==1"><text class="price-red">￥{{pl.jg*pl.unitNum}}</text></view>
-								<view class="uni-flex uni-flex-item5" v-if="status==0"><text class="price-red">￥{{pl.jg}}</text></view>
-								<view class="uni-flex uni-flex-item ">x{{pl.sl}}</view>
-							</view>
-						</view>
-					</view>
-					<view class="uni-flex uni-row  order-line">
-						配送费用：<text class="price-red">￥{{item.expressCost}}</text>
-					</view>
-					<view class="uni-flex uni-row  order-line">
-						订单小计：<text class="price-red">￥{{item.totalPrice}}</text>
-					</view>
-					<view class="uni-flex uni-row  order-line msg">
-						买家留言：
-						<input class="uni-input fontWnormal" v-model="item.message" placeholder="给卖家的留言(选填)" />
-					</view>
-				</view>
-
-			</view>
-		</view>
-
-		<view class="uni-flex uni-row footer">
-			<view class="uni-flex uni-flex-item">合计: <text class="price-red">￥{{allPrice}}</text></view>
-			<view class="uni-flex ">
-				<view class="uni-flex uni-flex-item btn" @click='order()'>去付款</view>
-			</view>
-		</view>
-		<attr-popup :show="showAttr" @hidePopup="hidePopup" :toptitle="toptitle" :productItems="items"></attr-popup>
-		<pay-popup :show="showPay" :banks="banks" @hidePopup="hidePayPopup" @wxPay="wxPay" @bankPay="bankPay"></pay-popup>
-	</view>
-</template>
-
-<script>
-	import {
-		mapState,
-		mapMutations
-	} from 'vuex'
-
-	import util from '../../../common/util.js';
-	import cart from '../../../common/cart.js';
-	import province from '../../../components/mpvue-citypicker/city-data/province.js';
-	import city from '../../../components/mpvue-citypicker/city-data/city.js';
-	import area from '../../../components/mpvue-citypicker/city-data/area.js';
-	import attrPopup from '../../../components/cartcommon/uni-popup-public.vue';
-	import payPopup from '../../../components/uni-popup-pay.vue';
-	export default {
-		computed: {
-			...mapState(['hasLogin', 'forcedLogin', 'jyyUser'])
-		},
-		components: {
-			attrPopup,
-			payPopup
-		},
-		data() {
-			return {
-				allPrice: '0.00',
-				allNum: 0,
-				json: [],
-				showAddress: false,
-				address: [],
-				user: {},
-				province: "",
-				city: "",
-				district: "",
-				addressId: "",
-				mode: false,
-				addressStr: "",
-				showAttr: false,
-				showPay: false,
-				items: [], //弹窗的数组,
-				toptitle: '',
-				banks: [],
-				status: '',
-				id: '',
-				orderNo: ''
-			};
-		},
-		onLoad(e) {
-			//0为直接购买，1为订单列表处结算
-			if (e.status == 1) {
-				this.status = 1;
-			} else {
-				this.status = 0;
-			}
-			this.addressId = e.addressId;
-			this.orderNo = e.orderNo;
-			this.id = e.id;
-			this.init();
-		},
-		onPullDownRefresh() {
-			this.init();
-		},
-
-		methods: {
-			init() {
-				if (!this.hasLogin) {
-					uni.navigateTo({
-						url: '../login/login',
-					});
-
-				} else {
-					this.user = JSON.parse(this.jyyUser);
-					if (this.orderNo == undefined) {
-						this.json = cart.getOrder();
-						this.orderNo = this.json[0].no;
-						this.getAddress();
-					} else {
-						this.getData();
-					}
-				}
-				uni.stopPullDownRefresh();
-			},
-			hidePopup() {
-				this.showAttr = false;
-			},
-			hidePayPopup() {
-				this.showPay = false;
-			},
-			goAddress() {
-				uni.redirectTo({
-					url: "../address/address?url=../order/order"
-				})
-			},
-			goAddressService() {
-				uni.redirectTo({
-					url: "../addressService/addressService?url=../order/order"
-				})
-			},
-			getData() {
-				uni.showLoading({
-					title: "加载中"
-				})
-				uni.request({
-					url: this.webUrl + 'GetOrder',
-					method: 'POST',
-					data: {
-						userid: this.user.id,
-						id: this.id
-					},
-					header: {
-						'content-type': 'application/x-www-form-urlencoded'
-					},
-					success: res => {
-						uni.hideLoading();
-						this.mode = true;
-						this.json = [];
-						this.json.push(res.data.uniOrder);
-						this.addressStr = res.data.uniOrder.express;
-						this.showAddress = true;
-						this.allPrice = (parseFloat(this.json[0].expressCost) + parseFloat(this.json[0].totalPrice)).toFixed(2);
-						//this.Refresh();
-						this.banks = res.data.banks;
-					},
-					fail: () => {},
-					complete: () => {}
-				});
-
-			},
-			getAddress() {
-				uni.showLoading({
-					title: "加载中",
-					mask: true
-				})
-				let data;
-				if (this.addressId == undefined) {
-					data = {
-						userid: this.user.id,
-						orderNo: this.orderNo
-					};
-				} else {
-					data = {
-						id: this.addressId,
-						orderNo: this.orderNo
-					};
-				}
-				uni.request({
-					url: this.webUrl + 'Address',
-					method: 'POST',
-					data: data,
-					header: {
-						'content-type': 'application/x-www-form-urlencoded'
-					},
-					success: res => {
-						uni.hideLoading();
-						if (res.data.result.isSuccess) {
-							this.showAddress = true;
-							this.address = res.data.address;
-							const p = province[res.data.address.province];
-							this.province = p.label;
-							const c = city[res.data.address.province][res.data.address.city];
-							this.city = c.label;
-							const d = area[res.data.address.province][res.data.address.city][res.data.address.district];
-							this.district = d.label;
-							this.Refresh();
-							this.banks = res.data.banks;
-						}
-					},
-					fail: () => {
-						uni.hideLoading();
-					},
-					complete: () => {
-						uni.hideLoading();
-					}
-				});
-			},
-			Refresh() {
-				let expressArr = [];
-				let all = 0;
-				for (let j = 0; j < this.json.length; j++) {
-					let arr = this.json[j].items;
-					let cost = 0;
-					let count = 0;
-					let totalPrice = 0;
-					for (let i = 0; i < arr.length; i++) {
-
-						//算同类型商品重量
-						let exist = false;
-						for (let k = 0; k < expressArr.length; k++) {
-							if (expressArr[k].id == arr[i].id) {
-								expressArr[k].weight += arr[i].weight * arr[i].sl * arr[i].unitNum;
-								expressArr[k].expressFees = arr[i].expressFees;
-								exist = true;
-								break
-							}
-						}
-						if (!exist) {
-							expressArr.push({
-								"id": arr[i].id,
-								"weight": arr[i].weight * arr[i].sl * arr[i].unitNum,
-								"expressFees": arr[i].expressFees
-							});
-						}
-						
-						count++;
-						totalPrice += parseFloat(arr[i].jg * arr[i].sl);
-						all += arr[i].jg * arr[i].sl;
-					}
-					//计算邮费
-					for (let l = 0; l < expressArr.length; l++) {
-						for (let m = 0; m < expressArr[l].expressFees.length; m++) {
-							if (expressArr[l].expressFees[m].province === this.province) {
-								cost += this.costExpress(expressArr[l].weight, expressArr[l].expressFees[m], l);
-							}
-						}
-					}
-
-					this.json[j].count = count;
-					this.json[j].totalPrice = (totalPrice + cost).toFixed(2);
-					this.json[j].expressCost = cost.toFixed(2);
-					if (!this.mode) {
-						this.json[j].express = this.address.nickName + " " + this.address.mobile + " " + this.province + " " + this.city +
-							" " + this.district + " " + this.address.addStr;
-					}
-					all += cost;
-				}
-				this.allPrice = all.toFixed(2); //返回数据	
-				if (!this.mode) {
-					this.ExpressCost();
-				}
-			},
-			ExpressCost() {
-				uni.request({
-					url: this.webUrl + 'ExpressCost',
-					method: 'POST',
-					data: {
-						user: JSON.stringify(this.user),
-						data: JSON.stringify(this.json)
-					},
-					header: {
-						'content-type': 'application/x-www-form-urlencoded'
-					},
-					success: res => {},
-					fail: () => {},
-					complete: () => {}
-				});
-			},
-			costExpress(weight, express, m) {
-				if (parseInt(express.first) > 0) {
-					if (weight > express.weight) {
-						let n = Math.ceil((weight - express.weight) / express.weight);
-						return parseFloat(express.first) + parseFloat(express.extend * n);
-					} else {
-						return parseFloat(express.first);
-					}
-				} else {
-					return 0;
-				}
-			},
-			order() {
-				if (!this.showAddress || this.addressStr == null) {
-					uni.showModal({
-						content: "请设置收货地址！",
-						showCancel: false
-					});
-					return;
-				}
-				uni.request({
-					url: this.webUrl + 'CheckAgency',
-					method: 'POST',
-					data: {
-						user: JSON.stringify(this.user),
-						data: JSON.stringify(this.json)
-					},
-					header: {
-						'content-type': 'application/x-www-form-urlencoded'
-					},
-					success: res => {
-						if (!res.data.result.isSuccess) {
-							this.showAttr = true;
-							this.items = res.data.items;
-							this.toptitle = res.data.result.resultInfo;
-						} else {
-							this.showPay = true;
-						}
-					},
-					fail: () => {},
-					complete: () => {}
-				});
-			},
-			bankPay(val) {
-				uni.request({
-					url: this.webUrl + 'BankPayment',
-					method: 'POST',
-					data: {
-						data: JSON.stringify(this.json),
-						user: JSON.stringify(this.user),
-						pass: val.pass,
-						bank: val.bank
-					},
-					header: {
-						'content-type': 'application/x-www-form-urlencoded'
-					},
-					success: (res) => {
-						uni.hideLoading();
-						if (res.data.result.isSuccess) {
-							cart.updateCart([]);
-							this.showPay = false;
-							uni.reLaunch({
-								url: "../orderSuccess/orderSuccess?no=" + this.json[0].no
-							});
-						} else {
-							uni.showToast({
-								icon: "none",
-								title: res.data.result.resultInfo
-							})
-						}
-					},
-					fail: (e) => {
-						uni.hideLoading();
-						uni.showToast({
-							icon: "none",
-							title: "该订单还未完成支付"
-						})
-					}
-				})
-			},
-			wxPay() {
-
-				uni.showLoading({
-					title: "提交中"
-				})
-				uni.login({
-					success: (e) => {
-						uni.request({
-							url: this.webUrl + 'Payment',
-							method: 'POST',
-							data: {
-								data: JSON.stringify(this.json),
-								user: JSON.stringify(this.user),
-								code: e.code
-							},
-							header: {
-								'content-type': 'application/x-www-form-urlencoded'
-							},
-							success: (res) => {
-								console.log(res);
-								uni.hideLoading();
-								if (res.statusCode !== 200) {
-									uni.showToast({
-										icon: "none",
-										title: "支付失败，请重试！"
-									})
-									return;
-								}
-								if (res.data.result.isSuccess) {
-									let paymentData = JSON.parse(res.data.result.resultInfo);
-									if (paymentData.resultcode == "SUCCESS") {
-										uni.requestPayment({
-											timeStamp: paymentData.timestamp.toString(),
-											nonceStr: paymentData.noncestr,
-											package: paymentData.package,
-											signType: 'MD5',
-											paySign: paymentData.sign,
-											success: (res) => {
-												cart.updateCart([]);
-												uni.redirectTo({
-													url: "../orderSuccess/orderSuccess?no=" + this.json[0].no
-												});
-											},
-											fail: (res) => {
-												uni.showToast({
-													icon: "none",
-													title: "该订单还未完成支付"
-												})
-											},
-											complete: () => {
-												this.loading = false;
-											}
-										})
-									} else {
-										uni.showToast({
-											icon: "none",
-											title: "该订单还未完成支付"
-										})
-									}
-								}
-							},
-							fail: (e) => {
-								uni.hideLoading();
-								uni.showToast({
-									icon: "none",
-									title: "该订单还未完成支付"
-								})
-							}
-						})
-					},
-					fail: (e) => {
-						uni.hideLoading();
-						uni.showModal({
-							content: "支付失败,原因为: " + e.errMsg,
-							showCancel: false
-						})
-					}
-				})
-			}
-		}
-	}
-</script>
-<style>
-
-</style>

pages/user/orderEms/orderEms.vue

@@ -1,98 +0,0 @@
-<template>
-	<view class="uni-flex uni-column jz_ems">
-		<view v-if="status=='0'">
-			<uni-steps :options="list" direction="column" :active="2"></uni-steps>
-		</view>
-		<view class="uni-flex  justify-align-center ems" v-if="status!='0'&status!=''">
-			<view class="tipImg">
-				<image src="../../../static/warn.png"></image>
-			</view>
-			<view class="uni-flex uni-column msgs">
-				<view class="titile">抱歉，查询物流失败！</view>
-				<view class="tip">请稍后再试。</view>
-			</view>
-		</view>
-	</view>
-</template>
-
-<script>
-	import {
-		mapState,
-		mapMutations
-	} from 'vuex'
-	import {
-		uniSteps
-	} from "@/components/uni-steps/uni-steps.vue"
-
-	export default {
-		computed: {
-			...mapState(['hasLogin', 'forcedLogin', 'jyyUser'])
-		},
-		components: {
-			uniSteps
-		},
-		methods: {
-			getData() {
-				uni.request({
-					url: this.webUrl + 'OrderLogistics',
-					method: 'POST',
-					data: {
-						id: this.orderId
-					},
-					header: {
-						'content-type': 'application/x-www-form-urlencoded'
-					},
-					success: res => {
-						this.status = JSON.parse(res.data.data).status;
-						if (this.status == "0") {
-							this.list = JSON.parse(res.data.data).result.list;
-							let b = JSON.stringify(this.list).replace(/status/g, "title");
-							let c = b.replace(/time/g, "desc");
-							this.list = JSON.parse(c);
-						}
-					},
-					fail: () => {
-						uni.hideLoading();
-					},
-					complete: () => {
-						uni.hideLoading();
-					}
-				});
-			}
-		},
-		onLoad(e) {
-			this.orderId = e.order.replace(/"/g,"");
-			this.getData();
-		},
-		data() {
-			return {
-				orderNo: '',
-				list: [],
-				status: ''
-			};
-		}
-	}
-</script>
-<style>
-	.jz_ems .ems {
-		margin-top: 300upx;
-	}
-
-	.jz_ems .tipImg image {
-		width: 80upx;
-		height: 80upx;
-	}
-
-	.jz_ems .titile {
-		font-weight: bold;
-		margin-top: -22upx;
-	}
-
-	.jz_ems .msgs {
-		margin-left: 20upx;
-	}
-
-	.jz_ems .tip {
-		margin-top: -5upx;
-	}
-</style>

pages/user/orderInfo/orderInfo.vue

@@ -1,462 +0,0 @@
-<template>
-	<view class="uni-flex uni-column  orderInfo ">
-		<view class="uni-flex uni-column orderInfo-status">
-			<!-- <image mode="widthFix" src="../../../static/order/status1.jpg"></image> -->
-			<view class="uni-flex uni-flex-item"></view>
-			<view class="uni-flex uni-flex-item2 item-padding fontWt">{{ orderStatus }}</view>
-			<view v-if="showTimer" class="uni-flex uni-flex-item2 item-padding">
-				<uni-order-countdown
-					bgrColor="transparent"
-					borderColor="transparent"
-					splitorColor="#fff"
-					fontColor="#fff"
-					:orderStr="orderStr"
-					:timer="timer"
-				></uni-order-countdown>
-			</view>
-			<view class="uni-flex uni-flex-item"></view>
-		</view>
-		<!-- <view class="uni-flex uni-column order-address">
-			<view class="uni-flex uni-column order-address-box">
-				<view class="uni-flex uni-flex-item uni-row orderMsg">收货信息</view>
-				<view class="uni-flex uni-flex-item uni-row">
-					{{data.express}}
-				</view>
-			</view>
-			<view class="uni-flex uni-flex-item order-address-line">
-				<image src="../../../static/cart/line.png" mode="widthFix"></image>
-			</view>
-		</view> -->
-		<view class=" order-address">
-			<view class=" order-address-box">
-				<view class=" orderMsg">收货信息</view>
-				<view class=" uni-row">{{ orderInfo.express }}</view>
-			</view>
-			<view class="uni-flex uni-flex-item order-address-line"><image src="../../../static/cart/line.png"></image></view>
-		</view>
-
-		<view class="uni-flex uni-column order-items">
-			<view class="uni-flex uni-row uni-flex-item order-shop-name order-boder">{{ orderInfo.shopName }}</view>
-			<view class="uni-flex uni-row order-item" v-for="(item, key) in orderInfo.items" :key="key">
-				<view class="uni-flex uni-flex-item pic item-padding"><image mode="widthFix" :src="item.pic"></image></view>
-				<view class="uni-flex uni-column uni-flex-item3 item-padding">
-					<text class="uni-text order-title">{{ item.title }}</text>
-					<text class="uni-text order-specs">{{ item.productSpecsStr }}</text>
-					<text class="uni-text order-specs">小计</text>
-				</view>
-				<view class="uni-flex uni-column uni-flex-item item-padding">
-					<text class="uni-text color-f40">￥{{ item.totalPrice / item.amount }}</text>
-					<text class="uni-text">x{{ item.amount }}</text>
-					<text class="uni-text color-f40">￥{{ item.totalPrice }}</text>
-				</view>
-			</view>
-			<view class="uni-flex order-line item-padding order-boder order-line-small">
-				<view class="uni-flex uni-flex-item">商品总件</view>
-				<view class="uni-flex uni-flex-item justify-flex-end">{{ orderInfo.orderItemCount }}</view>
-			</view>
-			<view class="uni-flex order-line item-padding order-boder order-line-small">
-				<view class="uni-flex uni-flex-item">商品总价</view>
-				<view class="uni-flex uni-flex-item justify-flex-end">￥{{ orderInfo.totalPrice }}</view>
-			</view>
-			<view class="uni-flex order-line item-padding order-boder order-line-small">
-				<view class="uni-flex uni-flex-item">运费(快递)</view>
-				<view class="uni-flex uni-flex-item justify-flex-end">￥{{ orderInfo.expressCost }}</view>
-			</view>
-			<view class="uni-flex order-line item-padding totalPrice ">
-				<view class="uni-flex uni-flex-item">订单总价</view>
-				<view class="uni-flex uni-flex-item justify-flex-end color-f40">￥{{ allPrice }}</view>
-			</view>
-		</view>
-
-		<view class="uni-flex uni-column oderinfo-other">
-			<view class="uni-flex order-line-small item-padding order-boder">订单编号：{{ orderInfo.orderNo }}</view>
-			<view class="uni-flex order-line-small item-padding order-boder">创建时间：{{ orderInfo.createDate }}</view>
-			<!-- 收款信息：<text style="font-size: 28upx; color: #FF0000;">{{orderInfo.payBankInfo}}</text> -->
-			<view v-if="orderInfo.payBankCode" class="uni-flex order-line-small item-padding order-boder uni-column">
-				<view class="uni-flex order-line-small  order-boder space-between">
-					<view>收款对象：{{ payBankInfo.getMoneyPeople }}</view>
-					<view class="setClipboardData" @click="setClipboardData(payBankInfo.getMoneyPeople)">复制</view>
-				</view>
-				<view class="uni-flex order-line-small order-boder space-between">
-					<view>银行名称：{{ payBankInfo.bankName }}</view>
-					<view class="setClipboardData" @click="setClipboardData(payBankInfo.bankName)">复制</view>
-				</view>
-				<view class="uni-flex order-line-small  order-boder space-between">
-					<view>银行账号：{{ payBankInfo.bankNum }}</view>
-					<view class="setClipboardData" @click="setClipboardData(payBankInfo.bankNum)">复制</view>
-				</view>
-				<view class="uni-flex order-line-small  order-boder space-between">
-					<view>银行地址：{{ payBankInfo.bankAddress }}</view>
-					<view class="setClipboardData" @click="setClipboardData(payBankInfo.bankAddress)">复制</view>
-				</view>
-			</view>
-			<view v-if="orderInfo.payBankCode" class="uni-flex order-line-small item-padding order-boder">
-				汇款识别码：
-				<text style="font-size: 28upx; color: #FF0000;">{{ orderInfo.payBankCode }}</text>
-			</view>
-			<view v-if="waitPayBtn" class="uni-flex order-line-small item-padding order-boder align-items" style="height: 220upx;">
-				<view class="">上传汇款单：</view>
-				<view class="uni-flex-item">
-					<robby-image-upload
-						v-model="imageData"
-						fileKeyName="data"
-						:limit="3"
-						:server-url="serverUrl"
-						:showUploadProgress="show"
-						:form-data="formData"
-						@delete="deleteImage"
-						@add="addImage"
-					></robby-image-upload>
-				</view>
-			</view>
-		</view>
-
-		<view class="uni-flex uni-row footer justify-flex-end">
-			<view v-if="delBtn" class="btn" @click="bindDel">删除订单</view>
-			<view v-if="cancelBtn" class="btn" @click="bindCancel">取消订单</view>
-			<view v-if="payBtn" class="btn" @click="bindPay">付款</view>
-			<view v-if="waitPayBtn" class="btn">等待汇款</view>
-			<view v-if="refundBtn" class="btn" @click="bindRefund">{{ refundStr }}</view>
-			<view v-if="emsBtn" class="btn" @click="bindEms">查看物流</view>
-			<view v-if="doneBtn" class="btn" @click="bindDone">确认收货</view>
-			<!-- <view v-if="evaluateBtn" class="btn" @click="bindEvaluate">
-				{{evaluateStr}}
-			</view> -->
-		</view>
-	</view>
-</template>
-
-<script>
-import order from '../../../common/order.js';
-import util from '../../../common/util.js';
-import uniOrderCountdown from '../../../components/uni-order-countdown.vue';
-import robbyImageUpload from '../../../components/robby-image-upload/robby-image-upload.vue';
-import { mapState, mapMutations } from 'vuex';
-
-export default {
-	components: {
-		uniOrderCountdown,
-		robbyImageUpload
-	},
-	computed: {
-		...mapState(['hasLogin', 'forcedLogin', 'jyyUser']),
-		allPrice: function() {
-			return (parseFloat(this.orderInfo.totalPrice) + parseFloat(this.orderInfo.expressCost)).toFixed(2);
-		},
-		delBtn: function() {
-			return this.orderInfo.orderStatus == 99;
-		},
-		cancelBtn: function() {
-			return this.orderInfo.orderStatus == 1;
-		},
-		payBtn: function() {
-			return (this.orderInfo.orderStatus == 1) & (this.orderInfo.payMode == 0);
-		},
-		waitPayBtn: function() {
-			return (this.orderInfo.orderStatus == 1) & (this.orderInfo.payMode == 2);
-		},
-		refundBtn: function() {
-			return this.orderInfo.orderStatus == 2 || this.orderInfo.orderStatus == 3;
-		},
-		refundStr: function() {
-			let str = '';
-			switch (parseInt(this.orderInfo.refundState)) {
-				case 0:
-					str = '申请退款';
-					break;
-				case 1:
-					str = '退款中';
-					break;
-				case 2:
-					str = '退款成功';
-					break;
-				case 3:
-					str = '退款失败';
-			}
-			return str;
-		},
-		emsBtn: function() {
-			return this.orderInfo.orderStatus == 3 || this.orderInfo.orderStatus == 4;
-		},
-		doneBtn: function() {
-			return this.orderInfo.orderStatus == 3;
-		},
-		evaluateBtn: function() {
-			return this.orderInfo.orderStatus == 4;
-		},
-		evaluateStr: function() {
-			let str = '';
-			switch (parseInt(this.orderInfo.evaluateState)) {
-				case 0:
-					str = '立即评价';
-					break;
-				case 1:
-					str = '查看评价';
-					break;
-			}
-			return str;
-		},
-		orderStatus: function() {
-			let str = '';
-			switch (parseInt(this.orderInfo.orderStatus)) {
-				case 1:
-					str = '待付款';
-					break;
-				case 2:
-					str = '已支付';
-					break;
-				case 3:
-					str = '已发货';
-					break;
-				case 4:
-					str = '交易成功';
-					break;
-				case 99:
-					str = '订单取消';
-					break;
-			}
-			return str;
-		}
-	},
-	methods: {
-		setClipboardData(val) {
-			uni.setClipboardData({
-				data: val,
-				success() {
-					uni.showToast({
-						title: '复制成功',
-						icon: 'none'
-					});
-				}
-			});
-		},
-		bindDone(e) {
-			order.done(this.webUrl, this.orderInfo, this.user);
-		},
-		bindDel() {
-			order.del(this.webUrl, this.orderInfo, this.user.id);
-		},
-		bindCancel(e) {
-			order.cancel(this.webUrl, this.orderInfo, this.user.id);
-		},
-		bindPay(e) {
-			order.pay(this.orderInfo);
-		},
-		bindRefund(e) {
-			order.refund(this.orderInfo);
-		},
-		bindEms(e) {
-			order.ems(this.orderInfo);
-		},
-		bindEvaluate(e) {
-			order.evaluate(this.orderInfo);
-		},
-		init() {
-			this.getData();
-		},
-		deleteImage: function(e) {
-			let imageData2 = [];
-			if (e.allImages.length > 0) {
-				for (let i = 0; i < e.allImages.length; i++) {
-					imageData2.push({ pic: e.allImages[i] });
-				}
-			}
-			uni.request({
-				url: this.webUrl + 'OrderPayBankPic',
-				method: 'POST',
-				data: {
-					orderNo: this.orderInfo.orderNo,
-					userid: this.user.id,
-					pic: JSON.stringify(imageData2)
-				},
-				header: {
-					'content-type': 'application/x-www-form-urlencoded'
-				},
-				success: res => {
-					if (res.data.result.isSuccess) {
-						uni.showToast({
-							title: res.data.result.resultInfo,
-							icon: 'none'
-						});
-					}
-				},
-				fail: () => {},
-				complete: () => {}
-			});
-		},
-		addImage: function(e) {
-			let imageData2 = [];
-			if (e.allImages.length > 0) {
-				for (let i = 0; i < e.allImages.length; i++) {
-					imageData2.push({ pic: e.allImages[i] });
-				}
-				uni.request({
-					url: this.webUrl + 'OrderPayBankPic',
-					method: 'POST',
-					data: {
-						orderNo: this.orderInfo.orderNo,
-						userid: this.user.id,
-						pic: JSON.stringify(imageData2)
-					},
-					header: {
-						'content-type': 'application/x-www-form-urlencoded'
-					},
-					success: res => {
-						if (res.data.result.isSuccess) {
-							uni.showToast({
-								title: res.data.result.resultInfo,
-								icon: 'none'
-							});
-						}
-					},
-					fail: () => {},
-					complete: () => {}
-				});
-			}
-		},
-		getData() {
-			uni.showLoading({
-				title: '加载中'
-			});
-			uni.request({
-				url: this.webUrl + 'GetOrderInfo',
-				method: 'POST',
-				data: {
-					orderNo: this.orderNo,
-					userId: this.user.id
-				},
-				header: {
-					'content-type': 'application/x-www-form-urlencoded'
-				},
-				success: res => {
-					uni.hideLoading();
-					if (res.data.result.isSuccess) {
-						this.orderInfo = res.data.result.uniOrder;
-						if (this.orderInfo.payBankPic != null) {
-							let arr = JSON.parse(this.orderInfo.payBankPic);
-							for (let i = 0; i < arr.length; i++) {
-								this.imageData.push(arr[i].Pic);
-							}
-						}
-						this.payBankInfo.getMoneyPeople = this.orderInfo.payBankInfo.split(',')[0];
-						this.payBankInfo.bankName = this.orderInfo.payBankInfo.split(',')[1];
-						this.payBankInfo.bankNum = this.orderInfo.payBankInfo.split(',')[2];
-						this.payBankInfo.bankAddress = this.orderInfo.payBankInfo.split(',')[3];
-						let s = '';
-						switch (parseInt(this.orderInfo.orderStatus)) {
-							case 1:
-								s = '后自动关闭';
-								this.timer = util.dateAddDays(this.orderInfo.createDate, 1 / 96);
-								this.showTimer = true;
-								break;
-							case 2:
-								break;
-							case 3:
-								this.showTimer = true;
-								this.timer = util.dateAddDays(this.orderInfo.expressDate, 7);
-								s = '后自动确认';
-								break;
-							case 4:
-								break;
-							case 99:
-								break;
-						}
-						this.orderStr = s;
-						switch (parseInt(this.orderInfo.orderStatus)) {
-							case 1:
-								break;
-							case 2:
-								break;
-							case 3:
-								break;
-							case 4:
-								break;
-							case 99:
-								break;
-						}
-					} else {
-						uni.showToast({
-							title: res.data.result.resultInfo,
-							icon: 'none'
-						});
-					}
-				},
-				fail: () => {},
-				complete: () => {}
-			});
-		}
-	},
-	onPullDownRefresh() {
-		this.getData();
-		setTimeout(function() {
-			uni.stopPullDownRefresh();
-		}, 1000);
-	},
-	onLoad(e) {
-		if (!this.hasLogin) {
-			uni.navigateTo({
-				url: '../login/login'
-			});
-		} else {
-			this.user = JSON.parse(this.jyyUser);
-			this.orderNo = e.order.replace(/"/g, '');
-			/*let arr = JSON.parse(e.arr);
-				this.newsitems = arr[0];
-				this.one = arr[1];
-				this.two = arr[2]; */
-			this.init();
-		}
-	},
-	data() {
-		return {
-			orderStr: '关闭交易',
-			timer: '',
-			showTimer: false,
-			one: '',
-			two: '',
-			orderInfo: {},
-			user: {},
-			newsitems: [],
-			imageData: [],
-			serverUrl: this.webUrl + 'Upload',
-			show: true,
-			formData: {
-				userId: 2
-			},
-			orderNo: '',
-			payBankInfo: {
-				getMoneyPeople: '',
-				bankName: '',
-				bankNum: '',
-				bankAddress: ''
-			}
-		};
-	}
-};
-</script>
-
-<style>
-.order-items .order-specs {
-	width: auto;
-}
-.orderMsg {
-	/* font-weight: 700; */
-	color: #000000;
-}
-.orderInfo .order-line-small {
-	height: auto;
-}
-.setClipboardData {
-	margin-left: 30upx;
-	color: #ff4400;
-}
-.orderInfo .imageItem,
-.orderInfo .imageUpload {
-	width: 140upx;
-	height: 140upx;
-}
-.imageItem image, .moveImage{
-	width: 140upx!important;
-	height: 140upx!important;
-}
-</style>

pages/user/orderList/orderList.vue

@@ -1,338 +0,0 @@
-<template>
-	<view class="uni-tab-bar">
-		<scroll-view id="tab-bar" class="uni-swiper-tab jz_orderList" scroll-x :scroll-left="scrollLeft">
-			<view v-for="(tab, index) in tabBars" :key="tab.id" :class="['swiper-tab-list', tabIndex == index ? 'active' : '']" :id="tab.id" :data-current="index" @tap="tapTab">
-				{{ tab.name }}
-			</view>
-		</scroll-view>
-		<swiper :current="tabIndex" class="swiper-box" duration="300" @change="changeTab">
-			<swiper-item v-for="(tab, index1) in newsitems" :key="index1">
-				<scroll-view class="list" scroll-y :scroll-top="scrollTop" @scrolltolower="loadMore(index1)" @scroll="scroll">
-					<block v-for="(item, index2) in tab.items" :key="index2">
-						<!-- <order-Item :popItem="newsitem" :popNewsitems="newsitems" :one="index1" :two="index2" :user="user"></order-Item> -->
-						<view v-if="item.orderStatus < 100" class="uni-flex uni-column order-items" @click="bindClick(item)">
-							<view class="uni-flex uni-row uni-flex-item order-shop-name order-boder">
-								<view class="orderNo">订单号: {{ item.orderNo }}</view>
-								<view class="uni-flex uni-flex-item order-status">
-									<text v-if="item.orderStatus == 1">待付款</text>
-									<text v-if="item.orderStatus == 2">已支付</text>
-									<text v-if="item.orderStatus == 3">已发货</text>
-									<text v-if="item.orderStatus == 4">交易成功</text>
-									<text v-if="item.orderStatus == 99">订单取消</text>
-								</view>
-							</view>
-							<view class="uni-flex uni-column orderList">
-								<view class="uni-flex uni-row order-item" v-for="(item, key) in item.items" :key="key" :class="[]">
-									<view class="uni-flex uni-flex-item pic item-padding"><image mode="widthFix" :src="item.pic"></image></view>
-									<view class="uni-flex uni-column uni-flex-item3 item-padding" style="margin-top: -10upx;">
-										<text class="uni-text order-title">{{ item.title }}</text>
-										<text class="uni-text order-specs">{{ item.productSpecsStr }}</text>
-										<text class="uni-text order-specs">小计</text>
-									</view>
-									<view class="uni-flex uni-column uni-flex-item item-padding" style="margin-top: -16upx;">
-										<text class="uni-text price-red">￥{{ item.prices }}</text>
-										<text class="uni-text" style="padding-left: 10upx;">x{{ item.amount }}</text>
-										<text class="uni-text price-red">￥{{ item.totalPrice }}</text>
-									</view>
-								</view>
-							</view>
-							
-							<view class="uni-flex order-line item-padding ">
-								<text class="allCount">共{{ item.orderItemCount }}件商品</text>
-								合计：
-								<text class="price-red allPrice">￥{{ item.actualPayment }}</text>
-								(含运费：
-								<text class="price-red">￥{{ item.expressCost }}</text>
-								)
-							</view>
-							<view class="uni-flex order-line item-padding order-boder">{{ item.createDate }}</view>
-							<view v-if="item.sales > 0" class="uni-flex uni-row order-line item-padding order-boder order-status">{{ item.groupStatus }}</view>
-							<view class="uni-flex order-line item-padding order-btn">
-								<view v-if="item.orderStatus == 99" class="btn" @click.stop="bindDel(item)">删除订单</view>
-								<view v-if="item.orderStatus == 1" class="btn" @click.stop="bindCancel(item)">取消订单</view>
-								<view v-if="(item.orderStatus == 1) & (item.payMode == 0)" class="btn" @click.stop="bindPay(item)">付款</view>
-								<view v-if="(item.orderStatus == 1) & (item.payMode == 2)" class="btn" @click.stop="bindClick(item)">等待汇款</view>
-								<view v-if="item.orderStatus == 2" class="btn" @click.stop="bindClick(item)">等待发货</view>
-								<view v-if="refundBtn" class="btn" @click.stop="bindRefund(item)">
-									<text v-if="item.refundState == 0">申请退款</text>
-									<text v-if="item.refundState == 1">退款中</text>
-									<text v-if="item.refundState == 2">退款成功</text>
-									<text v-if="item.refundState == 3">退款失败</text>
-								</view>
-								<view v-if="item.orderStatus == 3 || item.orderStatus == 4" class="btn" @click.stop="bindEms(item)">查看物流</view>
-								<view v-if="item.orderStatus == 3" class="btn" @click.stop="bindDone(item)">确认收货</view>
-								<!-- <view v-if="item.orderStatus == 4" class="btn" @click.stop="bindEvaluate(item)">
-									<text v-if="item.evaluateState==0">立即评价</text>
-									<text v-if="item.evaluateState==1">查看评价</text>
-								</view> -->
-							</view>
-						</view>
-					</block>
-					<view class="uni-tab-bar-loading"><uni-load-more :loadingType="tab.loadingType" :contentText="loadingText"></uni-load-more></view>
-				</scroll-view>
-			</swiper-item>
-		</swiper>
-		<backTop :src="backTop.src" @setScrollTop="setScrollTop" tab="true" :scrollTop="backTop.scrollTop"></backTop>
-	</view>
-</template>
-<script>
-import { mapState, mapMutations } from 'vuex';
-
-import orderItem from '@/components/tab-nvue/orderItem.vue';
-import uniLoadMore from '@/components/uni-load-more.vue';
-import backTop from '@/components/uni-top.vue';
-import order from '../../../common/order.js';
-export default {
-	computed: {
-		...mapState(['hasLogin', 'forcedLogin', 'jyyUser'])
-	},
-	components: {
-		orderItem,
-		uniLoadMore,
-		backTop
-	},
-	data() {
-		return {
-			backTop: {
-				src: '../../../static/top.png',
-				scrollTop: 0
-			},
-			scrollTop: 0,
-			oldScrollTop: 0,
-			loadingText: {
-				contentdown: '上拉显示更多',
-				contentrefresh: '正在加载...',
-				contentnomore: '没有更多数据了'
-			},
-			scrollLeft: 0,
-			isClickChange: false,
-			tabIndex: 0,
-			user: {},
-			newsitems: [
-				{
-					loadingType: 0,
-					pageIndex: 1,
-					items: []
-				},
-				{
-					loadingType: 0,
-					pageIndex: 1,
-					items: []
-				},
-				{
-					loadingType: 0,
-					pageIndex: 1,
-					items: []
-				},
-				{
-					loadingType: 0,
-					pageIndex: 1,
-					items: []
-				},
-				{
-					loadingType: 0,
-					pageIndex: 1,
-					items: []
-				}
-			],
-			tabBars: [
-				{
-					name: '全部',
-					id: 'all'
-				},
-				{
-					name: '待付款',
-					id: 'pay'
-				},
-				{
-					name: '待发货',
-					id: 'send'
-				},
-				{
-					name: '待收货',
-					id: 'wait'
-				},
-				{
-					name: '退款/售后',
-					id: 'service'
-				}
-			]
-		};
-	},
-	onLoad(e) {
-		if (!this.hasLogin) {
-			uni.navigateTo({
-				url: '../login/login'
-			});
-		} else {
-			this.tabIndex = e.tab;
-			this.user = JSON.parse(this.jyyUser);
-			this.getData(this.tabIndex);
-		}
-	},
-	methods: {
-		bindDone(e) {
-			order.done(this.webUrl, e, this.user);
-		},
-		bindDel(e) {
-			order.del(this.webUrl, e, this.user.id);
-		},
-		bindCancel(e) {
-			order.cancel(this.webUrl, e, this.user.id);
-		},
-		bindClick(e) {
-			order.view(e);
-		},
-		bindPay(e) {
-			order.pay(e);
-		},
-		bindRefund(e) {
-			order.refund(e);
-		},
-		bindEms(e) {
-			order.ems(e);
-		},
-		bindEvaluate(e) {
-			order.evaluate(e);
-		},
-		loadMore(e) {
-			setTimeout(() => {
-				this.addData(e);
-			}, 1200);
-		},
-		setScrollTop() {
-			this.scrollTop = this.oldScrollTop;
-			this.$nextTick(function() {
-				this.scrollTop = 0;
-			});
-			this.backTop.scrollTop = 0;
-		},
-		noRepeat(arr) {
-			var i,
-				j,
-				len = arr.length;
-			for (i = 0; i < len; i++) {
-				for (j = i + 1; j < len; j++) {
-					if (arr[i].orderNo == arr[j].orderNo) {
-						arr.splice(j, 1);
-						len--;
-						j--;
-					}
-				}
-			}
-			return arr;
-		},
-		scroll(e) {
-			this.backTop.scrollTop = e.detail.scrollTop;
-			this.oldScrollTop = e.detail.scrollTop;
-		},
-		addData(e) {
-			this.getData(e);
-		},
-		async changeTab(e) {
-			if (this.newsitems[e.target.current].items.length == 0) {
-				this.getData(e.target.current);
-			}
-			let index = e.target.current;
-			if (this.isClickChange) {
-				this.tabIndex = index;
-				this.isClickChange = false;
-				return;
-			}
-			let tabBar = await this.getElSize('tab-bar'),
-				tabBarScrollLeft = tabBar.scrollLeft;
-			let width = 0;
-
-			for (let i = 0; i < index; i++) {
-				let result = await this.getElSize(this.tabBars[i].id);
-				width += result.width;
-			}
-			let winWidth = uni.getSystemInfoSync().windowWidth,
-				nowElement = await this.getElSize(this.tabBars[index].id),
-				nowWidth = nowElement.width;
-			if (width + nowWidth - tabBarScrollLeft > winWidth) {
-				this.scrollLeft = width + nowWidth - winWidth;
-			}
-			if (width < tabBarScrollLeft) {
-				this.scrollLeft = width;
-			}
-			this.isClickChange = false;
-			this.tabIndex = index; //一旦访问data就会出问题
-		},
-		getData(e) {
-			if (this.newsitems[e].loadingType == 2) {
-				return;
-			}
-			this.newsitems[e].loadingType = 1;
-			uni.request({
-				url: this.webUrl + 'OrderList',
-				method: 'POST',
-				data: {
-					pageIndex: this.newsitems[e].pageIndex,
-					userid: this.user.id,
-					status: e
-				},
-				header: {
-					'content-type': 'application/x-www-form-urlencoded'
-				},
-				success: res => {
-					if (res.data.result.uniOrderList.length > 0) {
-						this.newsitems[e].items = this.newsitems[e].items.concat(res.data.result.uniOrderList);
-						this.newsitems[e].items = this.noRepeat(this.newsitems[e].items);
-					} else {
-						this.newsitems[e].loadingType = 2;
-						return;
-					}
-					if (this.newsitems[e].pageIndex == parseInt(res.data.result.pages)) {
-						this.newsitems[e].loadingType = 2;
-						return;
-					} else {
-						this.newsitems[e].loadingType = 0;
-					}
-					this.newsitems[e].pageIndex++;
-				},
-				fail: () => {},
-				complete: () => {}
-			});
-		},
-		getElSize(id) {
-			//得到元素的size
-			return new Promise((res, rej) => {
-				uni.createSelectorQuery()
-					.select('#' + id)
-					.fields(
-						{
-							size: true,
-							scrollOffset: true
-						},
-						data => {
-							res(data);
-						}
-					)
-					.exec();
-			});
-		},
-		async tapTab(e) {
-			//点击tab-bar
-			if (this.tabIndex === e.target.dataset.current) {
-				return false;
-			} else {
-				let tabBar = await this.getElSize('tab-bar'),
-					tabBarScrollLeft = tabBar.scrollLeft; //点击的时候记录并设置scrollLeft
-				this.scrollLeft = tabBarScrollLeft;
-				this.isClickChange = true;
-				this.tabIndex = e.target.dataset.current;
-			}
-		}
-	}
-};
-</script>
-
-<style>
-.uni-swiper-tab {
-	background: #ffffff;
-}
-.order-items .order-specs {
-	width: auto;
-}
-</style>

pages/user/orderPay/orderPay.vue

@@ -1,151 +0,0 @@
-<template>
-	<view class="uni-flex uni-column cart order">
-		<view class="uni-flex uni-column uni-flex-item" style="margin-bottom: 80upx;">
-
-			<view class="uni-flex uni-column order-address">
-				<view class="uni-flex uni-column order-address-box">
-					<view class="uni-flex uni-flex-item uni-row">收货信息</view>
-					<view class="uni-flex uni-flex-item uni-row">
-						xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
-					</view>
-				</view>				
-				<view class="uni-flex uni-flex-item order-address-line">
-					<image src="../../../static/cart/line.png" mode="widthFix"></image>
-				</view>
-			</view>
-
-			<!-- 列表循环 -->
-			<view class="uni-flex uni-column uni-flex-item  cart-list" v-for="(item,m) in json" :key="item">
-				<view class="uni-flex uni-column item-shop ">
-					<!-- 商家 -->
-					<view class="uni-flex uni-row  order-line">
-						{{item.sj}}
-					</view>
-					<!-- 图片产品名称价格数量展示 -->
-					<view class="uni-flex uni-row  order-item" v-for="pl in json[m].items" :key="pl">
-						<!-- 商品图片 -->
-						<view class="uni-flex uni-flex-item item-padding item-img">
-							<image mode="widthFix" :src="pl.img"></image>
-						</view>
-						<view class="uni-flex uni-column item-padding uni-flex-item3">
-							<view class="uni-flex uni-flex-item">
-								{{pl.cp}}
-							</view>
-							<view class="uni-flex uni-flex-item">
-								<view class="uni-flex text cart-attr" v-for="(attr,n) in pl.attr" :key="attr">
-									{{attr.name}}：{{attr.value}}
-								</view>
-							</view>
-							<view class="uni-flex uni-row uni-flex-item">
-								<view class="uni-flex uni-flex-item5">￥{{pl.jg}}</view>
-								<view class="uni-flex uni-flex-item ">x{{pl.sl}}</view>
-							</view>
-						</view>
-					</view>
-
-					<view class="uni-flex uni-row  order-line">
-						订单编号：快递
-					</view>
-					<view class="uni-flex uni-row  order-line">
-						买家留言：{{item.message}}
-					</view>
-					<view class="uni-flex uni-row  order-line">
-						配送方式：快递{{item.expressCost}}
-					</view>
-					<view class="uni-flex uni-row  order-line">
-						支付金额：{{item.totalPrice}}
-					</view>
-				</view>
-			</view>
-
-			<view class="uni-flex uni-flex-item">
-				<radio-group class="uni-flex-item" @change="radioChange">
-					<label class="uni-list-cell uni-list-cell-pd">
-						<view>
-							<radio :value="1" checked="true" />
-						</view>
-						<view>金YY</view>
-					</label>
-					<label class="uni-list-cell uni-list-cell-pd">
-						<view>
-							<radio :value="1" />
-						</view>
-						<view>支付宝</view>
-					</label>
-					<label class="uni-list-cell uni-list-cell-pd">
-						<view>
-							<radio :value="1" />
-						</view>
-						<view>微信</view>
-					</label>
-				</radio-group>
-			</view>
-		</view>
-
-
-		<view class="uni-flex uni-row footer">
-			<view class="uni-flex-item3 uni-flex">付款金额: ￥{{allPrice}}</view>
-			<view class="uni-flex uni-flex-item justify-flex-end">
-				<view class="uni-flex uni-flex-item btn" @click='pay()'>立即支付</view>
-			</view>		
-		</view>
-
-	</view>
-</template>
-
-<script>
-	import {
-		mapState,
-		mapMutations
-	} from 'vuex'
-
-	import cart from '../../../common/cart.js';
-
-	export default {
-		computed: {
-			...mapState(['hasLogin', 'forcedLogin', 'jyyUser'])
-		},
-		data() {
-			return {
-				allPrice: '0.00',
-				allNum: 0,
-				json: [],
-				user: {},
-			};
-		},
-		onLoad(e) {
-			if (!this.hasLogin) {
-				uni.navigateTo({
-					url: '../login/login',
-				});
-			} else {
-				this.user = JSON.parse(this.jyyUser);
-				this.json = cart.getOrder();
-				this.price();
-				if (this.debug) {
-					console.log(this.json);
-				}
-			}
-		},
-		methods: {
-			price() {
-				let all = 0;
-				for (let j = 0; j < this.json.length; j++) {
-					all += parseFloat(this.json[j].expressCost) + parseFloat(this.json[j].totalPrice);
-				}
-				this.allPrice = all.toFixed(2); //返回数据
-			},
-			pay() {
-				uni.showToast({
-					icon: "none",
-					title: "未完成"
-				})
-			}
-		}
-	}
-</script>
-
-<style>
-
-
-</style>

pages/user/orderRefund/orderRefund.vue

@@ -1,236 +0,0 @@
-<template>
-	<view class="uni-flex uni-column  orderInfo ">
-		<view class="uni-flex uni-column order-items">
-			<view class="uni-flex uni-row uni-flex-item order-shop-name order-boder">
-				{{orderInfo.shopName}}
-			</view>
-			<view class="uni-flex uni-row order-item" v-for="(item,key) in orderInfo.items" :key="key">
-				<view class="uni-flex uni-flex-item pic item-padding">
-					<image mode="widthFix" :src="item.pic"></image>
-				</view>
-				<view class="uni-flex uni-column uni-flex-item3 item-padding">
-					<text class="uni-text order-title">{{item.title}}</text>
-					<text class="uni-text order-specs">{{item.productSpecsStr}}</text>
-				</view>
-				<view class="uni-flex uni-column uni-flex-item item-padding">
-					<text class="uni-text">￥{{item.price}}</text>
-					<text class="uni-text">x{{item.amount}}</text>
-				</view>
-			</view>
-			<view class="uni-flex order-line item-padding order-boder order-line-small">
-				<view class="uni-flex uni-flex-item">商品总价</view>
-				<view class="uni-flex uni-flex-item justify-flex-end">￥{{orderInfo.totalPrice}}</view>
-			</view>
-			<view class="uni-flex order-line item-padding order-boder order-line-small">
-				<view class="uni-flex uni-flex-item">运费(快递)</view>
-				<view class="uni-flex uni-flex-item justify-flex-end">￥{{orderInfo.expressCost}}</view>
-			</view>
-			<view class="uni-flex order-line item-padding totalPrice ">
-				<view class="uni-flex uni-flex-item">订单总价</view>
-				<view class="uni-flex uni-flex-item justify-flex-end color-f40">￥{{totalPrice}}</view>
-			</view>
-		</view>
-
-		<view class="uni-flex uni-column oderinfo-other">
-			<view class="uni-flex order-line-small item-padding order-boder">
-				订单编号：{{orderInfo.orderNo}}
-			</view>
-			<view class="uni-flex order-line-small item-padding order-boder">
-				创建时间：{{orderInfo.createDate}}
-			</view>
-		</view>
-
-		<view v-if="orderInfo.refundState == 0" class="uni-flex uni-flex-item order oderinfo-other">
-			<view class="uni-flex uni-flex-item uni-row order-address-box">
-				<view class="uni-flex order-address-ico">
-					<image src="../../../static/cart/location.png" mode="widthFix"></image>
-				</view>
-				<view v-if="orderInfo.orderStatus==2" class="uni-flex uni-column uni-flex-item4" @click="showPopup">
-					<view class="uni-flex uni-flex-item">仅退款</view>
-					<view class="uni-flex uni-flex-item">未收到货或商家协商同意前提下</view>
-				</view>
-				<view v-if="orderInfo.orderStatus==3" class="uni-flex uni-column uni-flex-item4" @click="showPopup">
-					<view class="uni-flex uni-flex-item">退款退货</view>
-					<view class="uni-flex uni-flex-item">已收到货，需要退款退货</view>
-				</view>
-			</view>
-		</view>
-
-		<view class="uni-flex uni-column order-refundLogs">
-			<view :class="refundLog.Mode=='1'? 'buyer': 'saler'" class="uni-flex uni-column " v-for="refundLog in refundLogs"
-			 :key="refundLog">
-				<view class="uni-flex uni-flex-item uni-row order-refundLog-title">
-					<view class="uni-flex uni-flex-item4">{{refundLog.Name}}</view>
-					<view class="uni-flex uni-flex-item1 order-refundLog-date">{{refundLog.CreateDate}}</view>
-				</view>
-				<view class="uni-flex uni-column order-refundLog">
-					<view class="uni-flex uni-flex-item uni-row">
-						{{refundLog.Step}}
-					</view>
-					<view class="uni-flex uni-flex-item uni-row order-refundLog-text">
-						{{refundLog.Text}}
-					</view>
-				</view>
-
-			</view>
-		</view>
-		<view class="uni-flex space"></view>
-		<refund-popup :show="hasShowPop" :user="user" :refunds="refunds" :express="express" :orderInfo="orderInfo" v-on:getData="getData"
-		 v-on:hidePopup="hidePopup"></refund-popup>
-
-		<view v-if="orderInfo.refundState > 0" class="uni-flex uni-row footer justify-flex-end">
-			<view v-if="orderInfo.refundState==1" class="btn">
-				等待处理
-			</view>
-			<view v-if="orderInfo.refundState==2" class="btn">
-				成功退款
-			</view>
-			<view v-if="orderInfo.refundState==3" class="btn" @click="reapply">
-				重新申请
-			</view>
-		</view>
-
-	</view>
-</template>
-
-<script>
-	import order from '../../../common/order.js';
-	import refundPopup from '../../../components/uni-popup-refund.vue';
-
-	import {
-		mapState,
-		mapMutations
-	} from 'vuex'
-
-	export default {
-		components: {
-			refundPopup
-		},
-		computed: {
-			...mapState(['hasLogin', 'forcedLogin', 'jyyUser']),
-			totalPrice: function() {
-				return (parseFloat(this.orderInfo.totalPrice) + parseFloat(this.orderInfo.expressCost)).toFixed(2);
-			}
-		},
-		methods: {
-			init() {
-				switch (parseInt(this.orderInfo.orderStatus)) {
-					case 2:
-						this.show = true;
-						break
-					case 3:
-						this.show = true;
-						break
-				}
-				this.refundLogs = JSON.parse(this.orderInfo.refundLog);
-			},
-			reapply() {
-				order.reapply(this.webUrl, this.orderInfo, this.user);
-				this.getData();
-			},
-			getRefunds() {
-				uni.request({
-					url: this.webUrl + 'OrderRefund',
-					method: 'POST',
-					header: {
-						'content-type': 'application/x-www-form-urlencoded'
-					},
-					success: res => {
-						this.refunds = res.data.result.uniOrderRefundList;
-						this.express = res.data.result.uniExpress;
-					},
-					fail: () => {},
-					complete: () => {}
-				});
-			},
-			hidePopup() {
-				this.hasShowPop = false;
-			},
-			showPopup() {
-				this.hasShowPop = true;
-			},
-			getData() {
-				uni.showLoading({
-					title: "加载中"
-				})
-				uni.request({
-					url: this.webUrl + 'GetOrderInfo',
-					method: 'POST',
-					data: {
-						orderNo: this.orderNo,
-						userId: this.user.id
-					},
-					header: {
-						'content-type': 'application/x-www-form-urlencoded'
-					},
-					success: res => {
-						uni.hideLoading();
-						if (res.data.result.isSuccess) {
-							this.orderInfo = res.data.result.uniOrder;
-							this.init();
-						}
-						else{
-							uni.showToast({
-								title:res.data.result.resultInfo,
-								icon:"none"
-							})
-						}
-					},
-					fail: () => {},
-					complete: () => {}
-				});
-			}
-
-		},
-		onPullDownRefresh() {
-			this.getData();
-			setTimeout(function() {
-				uni.stopPullDownRefresh();
-			}, 1000);
-		},
-		onLoad(e) {
-			if (!this.hasLogin) {
-				uni.navigateTo({
-					url: '../login/login',
-				});
-			} else {
-				this.user = JSON.parse(this.jyyUser);
-				console.log(e.order)
-				this.orderNo = e.order.replace(/"/g,"");
-				this.getRefunds();
-				this.getData();
-			}
-		},		
-		data() {
-			return {
-				hasShowPop: false,
-				orderInfo: {},
-				user: {},
-				refunds: [],
-				refundLogs: [],
-				express: [],
-				orderNo: ''
-			};
-		}
-	}
-</script>
-
-
-<style>
-	.order-address-ico { 
-		margin-top: 35upx;
-		margin-right: 10upx;
-		width: 40upx;
-		height: 40upx;
-	}
-	
-	.order-address-ico image {
-		width: 40upx;
-		height: 40upx;
-	}
-	
-	.orderInfo .order-refundLogs {
-		padding: 0;
-		margin: 16upx;
-	}
-</style>

pages/user/orderSuccess/orderSuccess.vue

@@ -1,183 +0,0 @@
-<template>
-	<view class="uni-flex paySuccess jz_paySuccess uni-column jz_merchant">
-
-		<view v-if="order.payMode==2" class="paySuccess_header uni-flex uni-column">
-			<view class="payok uni-flex justify-align-center">提交成功</view>
-			<view class="payarrive  uni-flex justify-align-center">转账请备注订单识别码：<text style="font-size: 28upx; color: #FF0000;">{{order.payBankCode}}</text></view>
-			<view class="paybtns  uni-flex justify-align-center uni-row">
-				<view @click="view()" class="lookOrder uni-flex justify-align-center">查看订单</view>
-				<view @click="home()" class="goHome uni-flex justify-align-center">继续逛</view>
-			</view>
-		</view>
-
-		<view v-else class="paySuccess_header uni-flex uni-column">
-			<view class="payok uni-flex justify-align-center">付款成功</view>
-			<view class="paybtns  uni-flex justify-align-center uni-row">
-				<view @click="view()" class="lookOrder uni-flex justify-align-center">查看订单</view>
-				<view @click="home()" class="goHome uni-flex justify-align-center">继续逛</view>
-
-			</view>
-		</view>
-
-		<!-- <view class="paySuccess_footer uni-flex uni-column">
-			<view class="payname uni-flex ">
-				<view class="paynick commonfont">{{address[0]}}</view>
-				<view class="payphone commonfont">{{address[1]}}</view>
-			</view>
-			<view class="payaddress commonfont">{{address[2]}}{{address[3]}}{{address[4]}}{{address[5]}}</view>
-			<view class="payprice uni-flex">
-				<view class="commonfont">实付</view>
-				<view class="commonfont">￥{{order.totalPrice}}</view>
-			</view>
-		</view> -->
-			<!-- <recommend :items="items" :src="src"></recommend> -->
-		<view class="recommend uni-flex uni-column">
-			<view class="push_product_title uni-flex justify-align-center">
-				<image :src="src"></image>
-				<view class="push_title">为你推荐</view>
-			</view>
-			<view class="uni-flex lists-wrap">
-				<view class="uni-flex uni-row list">
-					<view class="uni-product-list" id="list">
-						<view class="uni-product" v-for="(item, key) in items" :key="key" @click="goProduct(item)">
-							<view class="image-view uni-flex justify-align-center">
-								<!-- <image :src="item.pic"></image> -->
-								<image class="image" :class="{lazy:!item.display}" :id="'lazy'+ key" :data-index="0" @load="imageOnLoad(item)"
-								 :src="item.display?item.pic:''" />
-								<view class="loadbox" :class="{loaded:item.loaded}">
-									<view class="load"></view>
-								</view>
-							</view>
-							<view class="uni-flex uni-column uni-product-title-wrap">
-								<view class="uni-product-title uni-flex-item">{{ item.title }}</view>
-								<view class="product_details uni-flex uni-row">
-									{{item.profile}}
-								</view>
-								<view class="uni-flex-item prices uni-flex">
-									<view class="prices-salePrice">￥{{ item.salePrice }}</view>
-									<view class="prices-cart">
-										<image src="../../../static/category/cart.png"></image>
-									</view>
-								</view>
-							</view>
-						</view>
-					</view>
-				</view>
-			</view>
-		</view>
-		
-	</view>
-</template>
-
-<script>
-	import {
-		mapState,
-		mapMutations
-	} from 'vuex';
-	import util from '../../../common/util.js';
-	export default {
-		computed: {
-			...mapState(['hasLogin', 'forcedLogin', 'jyyUser'])
-		},
-		components: {
-			
-		},
-		methods: {
-			home() {
-				uni.switchTab({
-					url: '../../home/home'
-				});
-			},
-			view() {
-				uni.navigateTo({
-					url: '../orderInfo/orderInfo?order=' + JSON.stringify(this.order.orderNo),
-				});
-			},
-			getItems() {
-				uni.request({
-					url: this.webUrl + 'Recommend',
-					method: 'POST',
-					header: {
-						'content-type': 'application/x-www-form-urlencoded'
-					},
-					success: res => {
-						this.items = res.data.result.resultInfo;
-						setTimeout(()=>{
-							util.loads(this.items, 'list', this.windowHeight);
-						},300)
-					},
-					fail: () => {},
-					complete: () => {}
-				});
-			},
-			imageOnLoad(e) {
-				e.loaded = true;
-			},
-			goProduct(e) {
-				uni.navigateTo({
-					url: '../../merchant/product/product?id=' + e.id
-				})
-			},
-			getDate() {
-				uni.showLoading({
-					title: "加载中"
-				})
-				uni.request({
-					url: this.webUrl + 'GetOrderInfo',
-					method: 'POST',
-					data: {
-						orderNo: this.no,
-						userid: this.user.id
-					},
-					header: {
-						'content-type': 'application/x-www-form-urlencoded'
-					},
-					success: res => {
-						uni.hideLoading();
-						if (res.data.result.isSuccess) {
-							this.order = res.data.result.uniOrder;
-							let add = this.order.express;
-							this.address = add.split(" ");
-						} else {
-							uni.showToast({
-								title: res.data.result.resultInfo,
-								icon: "none"
-							})
-						}
-
-					},
-					fail: () => {},
-					complete: () => {}
-				});
-			}
-		},
-		onLoad(e) {
-			if (!this.hasLogin) {
-				uni.navigateTo({
-					url: '../login/login'
-				});
-			} else {
-				this.windowHeight = uni.getSystemInfoSync().windowHeight;
-				this.user = JSON.parse(this.jyyUser);
-				this.no = e.no;
-				this.getDate();
-				this.getItems();
-			}
-		},
-		onPageScroll() {
-			util.loads(this.items, 'list', this.windowHeight);
-		},
-		data() {
-			return {
-				user: {},
-				order: {},
-				address: [],
-				items: [],
-				src: '../../../static/pay04.png',
-				windowHeight: 0
-			};
-		}
-	};
-</script>
-
-<style></style>

pages/user/pay/pay.vue

@@ -1,303 +0,0 @@
-<template>
-	<view class="uni-flex uni-column cart jz_order order">
-		<view class="uni-flex uni-column uni-flex-item">
-			<!-- 列表循环 -->
-			<view class="uni-flex uni-column uni-flex-item  cart-list" v-for="(item,m) in json" :key="item">
-				<view class="uni-flex uni-column order-address">
-					<view class=" order-address-box">
-						<view class="">收货信息</view>
-						<view class="expressMsg fontWnormal">
-							{{item.express}}
-						</view>
-					</view>
-					<view class="uni-flex uni-flex-item order-address-line mg">
-						<image src="../../../static/cart/line.png"></image>
-					</view>
-				</view>
-				<view class="uni-flex uni-column item-shop ">
-					<!-- 商家 -->
-					<view class="uni-flex uni-row  order-line">
-						{{item.sj}}
-					</view>
-					<!-- 图片产品名称价格数量展示 -->
-					<view class="uni-flex uni-row  order-item" v-for="pl in json[m].items" :key="pl">
-						<!-- 商品图片 -->
-						<view class="uni-flex uni-flex-item item-padding item-img">
-							<image mode="widthFix" :src="pl.img"></image>
-						</view>
-						<view class="uni-flex uni-column item-padding uni-flex-item3">
-							<view class="uni-flex uni-flex-item">
-								{{pl.cp}}
-							</view>
-							<view class="uni-flex uni-flex-item">
-								<view class="uni-flex text cart-attr" v-for="(attr,n) in pl.attr" :key="attr">
-									{{attr.name}}：{{attr.value}}
-								</view>
-							</view>
-							<view class="uni-flex uni-row uni-flex-item">
-								<view class="uni-flex uni-flex-item5 price-red">￥{{pl.jg}}</view>
-								<view class="uni-flex uni-flex-item ">x{{pl.sl}}</view>
-							</view>
-						</view>
-					</view>
-
-					<view class="uni-flex uni-row  order-line">
-						订单编号：<text class="fontWnormal">{{item.no}}</text>
-					</view>
-					<view class="uni-flex uni-row  order-line">
-						配送费用：<text class="price-red">￥{{item.expressCost}}</text>
-					</view>
-					<view class="uni-flex uni-row  order-line">
-						支付金额：<text class="price-red">￥{{allprice}}</text>
-					</view>
-					<view class="uni-flex uni-row  order-line usermsg">
-						<view class="usermsg-lf">买家留言：</view>
-						<view class="fontWnormal usermsg-rt">{{item.message}}</view>
-					</view>
-				</view>
-			</view>
-		</view>
-
-		<view class="uni-btn-v uni-common-mt">
-			<button type="primary" @click="weixinPay" :loading="loading">微信支付</button>
-		</view>
-
-
-		<view class="uni-flex uni-row footer">
-			<!-- <view class="uni-flex-item uni-flex">付款金额: <text class="price-red">￥{{allprice}}</text></view>
-			<view class="buttons">
-				<view class="button" @click='home()'>再逛逛</view>
-			</view> -->
-			<view class="uni-flex uni-flex-item">付款金额:  <text class="price-red">￥{{allPrice}}</text></view>
-			<view class="uni-flex ">
-				<view class="uni-flex uni-flex-item btn" @click='home()'>再逛逛</view>
-			</view>
-		</view>
-
-	</view>
-</template>
-
-<script>
-	import {
-		mapState,
-		mapMutations
-	} from 'vuex'
-
-
-	import cart from '../../../common/cart.js';
-	import smsPopup from '../../../components/uni-popup-sms.vue';
-
-	export default {
-		components: {
-			smsPopup
-		},
-		computed: {
-			...mapState(['hasLogin', 'forcedLogin', 'jyyUser']),
-			allprice: function() {
-				let allprice = 0;
-				for (let j = 0; j < this.json.length; j++) {
-					let arr = this.json[j].items;
-					for (let i = 0; i < arr.length; i++) {
-						allprice += arr[i].jg * arr[i].sl;
-					}
-					allprice = allprice + parseFloat(this.json[j].expressCost)
-				}
-				return allprice.toFixed(2);
-			}
-		},
-		data() {
-			return {
-				allPrice: "0.00",
-				orderNo: "",
-				loading: false,
-				json: [],
-				user: {},
-			};
-		},
-		onLoad(e) {
-			if (!this.hasLogin) {
-				uni.navigateTo({
-					url: '../login/login',
-				});
-			} else {
-				this.user = JSON.parse(this.jyyUser);
-				this.orderNo = e.orderNo;
-				this.init();
-			}
-		},
-		onPullDownRefresh() {
-			this.init();
-			setTimeout(function() {
-				uni.stopPullDownRefresh();
-			}, 1000);
-		},
-		methods: {
-			weixinPay() {
-				console.log("发起支付");
-				this.loading = true;
-				uni.login({
-					success: (e) => {
-						console.log("login success", e);
-						uni.request({
-							url: this.webUrl + 'Payment',
-							method: 'POST',
-							data: {
-								data: JSON.stringify(this.json),
-								user: JSON.stringify(this.user)
-							},
-							header: {
-								'content-type': 'application/x-www-form-urlencoded'
-							},
-							success: (res) => {
-								if (res.statusCode !== 200) {
-									uni.showModal({
-										content: "支付失败，请重试！",
-										showCancel: false
-									});
-									return;
-								}
-								if (res.data.ret === 0) {
-									let paymentData = JSON.parse(res.data.payment);
-									if (paymentData.resultcode == "SUCCESS") {
-										uni.requestPayment({
-											timeStamp: paymentData.timestamp.toString(),
-											nonceStr: paymentData.noncestr,
-											package: paymentData.package,
-											signType: 'MD5',
-											paySign: paymentData.sign,
-											success: (res) => {
-												uni.showToast({
-													title: "支付成功!"
-												})
-												uni.navigateTo({
-													url: "../orderSuccess/orderSuccess"
-												});
-											},
-											fail: (res) => {
-												uni.showModal({
-													content: "支付失败,原因为: " + res
-														.errMsg,
-													showCancel: false
-												})
-											},
-											complete: () => {
-												this.loading = false;
-											}
-										})
-									} else {
-										uni.showModal({
-											content: "支付失败,原因为: " + paymentData.errcode + paymentData.errcodedes,
-											showCancel: false
-										})
-									}
-
-								} else {
-									uni.showModal({
-										content: res.data.desc,
-										showCancel: false
-									})
-								}
-							},
-							fail: (e) => {
-								this.loading = false;
-								uni.showModal({
-									content: "支付失败,原因为: " + e.errMsg,
-									showCancel: false
-								})
-							}
-						})
-					},
-					fail: (e) => {
-						this.loading = false;
-						uni.showModal({
-							content: "支付失败,原因为: " + e.errMsg,
-							showCancel: false
-						})
-					}
-				})
-			},
-			init() {
-				if (this.orderNo == undefined) {
-					this.json = cart.getOrder();
-				} else {
-					this.getData();
-				}
-				setTimeout(() => {
-					this.price();
-				}, 500)
-
-			},
-			getData() {
-				uni.showLoading({
-					title: "加载中"
-				})
-				uni.request({
-					url: this.webUrl + 'GetOrder',
-					method: 'POST',
-					data: {
-						userid: this.user.id,
-						orderNo: this.orderNo
-					},
-					header: {
-						'content-type': 'application/x-www-form-urlencoded'
-					},
-					success: res => {
-						uni.hideLoading();
-						this.json = [];
-						this.json.push(res.data.uniOrder);
-						let express = this.json[0].express;
-						let index = express.indexOf(" ");
-						this.mobile = express.slice(index, index + 12);
-						this.tip = this.mobile.substr(0, 3) + "******" + this.mobile.substr(10, 2);
-
-					},
-					fail: () => {},
-					complete: () => {}
-				});
-
-			},
-			price() {
-				let all = 0;
-				for (let j = 0; j < this.json.length; j++) {
-					all = parseFloat(this.json[j].totalPrice)
-				}
-				this.allPrice = all.toFixed(2); //返回数据
-			},
-			home() {
-				uni.switchTab({
-					url: '../../home/home'
-				});
-			}
-		}
-	}
-</script>
-
-<style>
-	.order .footer .button {
-		width: 160upx;
-		height: 64upx;
-		margin: 0 8upx;
-		color: #fff;
-		line-height: 64upx;
-		background: #f40;
-		border-radius: 16px;
-		padding: 0;
-		font-size: 28upx;
-		display: inline-block;
-		text-align: center;
-	}
-
-	.mg {
-		margin-top: 10upx;
-		width: 100%;
-	}
-
-	.mg image {
-		width: 100%;
-		height: 10upx;
-	}
-
-	.expressMsg {
-		width: calc(100% - 20upx);
-	}
-</style>

pages/user/profit/index.vue

@@ -1,578 +0,0 @@
-<template>
-	<view class="uni-flex lists jz_lists uni-column jz_myfit jz_agent  ">
-		<view class="tab-search uni-column">
-			<view class="tabList">
-				<scroll-view class="uni-flex uni-swiper-tab" scroll-x :scroll-left="scrollLeft" id="tab-bars">
-					<view v-for="(tab, i) in categorys" :key="i" class="swiper-tab-list" :id="'tab' + tab.id" :data-current="index"
-					 @click="changeTab(i, tab)">
-						<view class="productTitle-item uni-flex uni-column">
-							<image :src="tab.ico"></image>
-							<view :class="['picname', curIndex == i ? 'activeLine' : '']">{{ tab.title }}</view>
-						</view>
-					</view>
-				</scroll-view>
-				<view style="height: 10upx;background: #F4F5F6;width: 100%;"></view>
-			</view>
-			<view class="search uni-flex ">
-				<!-- :class="[sortNavfixed ? 'fixed' : '']" -->
-				<view class="uni-flex-item uni-flex search-input">
-					<input placeholder="关键词" @input="inputChange" v-model="key" :focus="isFocus" @focus="focus" @blur="blur" class="uni-flex-item" />
-					<icon v-if="isDelShow" class="icon icon-del" @click.stop="clear" type="clear" size="12"></icon>
-				</view>
-
-				<view class="searchBtn uni-flex justify-align-center" @click="search">
-					<image src="../../../static/search02.png"></image>
-					<text>搜索</text>
-				</view>
-			</view>
-		</view>
-
-		<view class="agent-product uni-flex uni-column" id="list">
-			<view class=" uni-flex uni-row uni-flex-item myfit-product" v-for="(item, key) in products" :key="key">
-				<view class="uni-flex product-img justify-align-center">
-					<image class="image" :class="{ lazy: !item.display }" :id="'lazy' + key" :data-index="0" @load="imageOnLoad(item, key)"
-					 :src="item.display ? item.pic : ''" style="left: 0;top: 0;"/>
-					<view class="loadbox" :class="{loaded:item.loaded}" style="left: 0;top: 0;">
-						<view class="load"></view>
-					</view>
-				</view>
-				<view class="uni-flex  uni-column space-between product-contents">
-					<view class="uni-flex title">{{item.title}}</view>
-					<view class="prices uni-flex uni-flex">
-						<view class="uni-flex">我的价格:{{item.costPrice}}/瓶</view>
-						<view class="uni-flex" style="margin-left: 20upx;">代理价格:{{item.salePrice}}/瓶</view>
-					</view>
-					<view class="uni-flex fen">
-						利润:<text>{{Math.round(item.salePrice*100-item.costPrice*100)/100}}</text>元
-					</view>
-				</view>
-			</view>
-		</view>
-
-		<load-more :loadingType="loadingType" :contentText="contentText"></load-more>
-		<backTop :src="backTop.src" :scrollTop="backTop.scrollTop"></backTop>
-
-	</view>
-</template>
-
-<script>
-	import {
-		mapState,
-		mapMutations
-	} from 'vuex';
-
-	import util from '../../../common/util.js';
-	import loadMore from '@/components/uni-load-more.vue';
-	import backTop from '@/components/uni-top.vue';
-	var index;
-	export default {
-		components: {
-			loadMore,
-			backTop
-		},
-		data() {
-			return {
-				loadingType: 0,
-				contentText: {
-					contentdown: "上拉显示更多",
-					contentrefresh: "正在加载...",
-					contentnomore: "没有更多数据了"
-				},
-				item: {},
-				showSlider: false,
-				sliderIndex: 0,
-				items: [{}, {}, {}],
-				user: {},
-				userid: 0,
-				active: false,
-				isDelShow: false,
-				isFocus: false,
-				sortNavfixed: false,
-				show: false,
-				windowHeight: 0,
-				type: 0,
-				cates: [{
-					css: '',
-					id: '0',
-					no: '000',
-					show: '0',
-					subs: [],
-					title: '全部'
-				}],
-				categorys: [{
-					ico: '../../../static/merchant/all.png',
-					id: '000',
-					no: '000',
-					title: '全部'
-				}],
-				category: {},
-				products: [],
-				product: {
-					ratio: 0
-				},
-				productKey: 0,
-				curIndex: 0,
-				key: '',
-				id: '000',
-				clock: 0,
-				scrollLeft: 0,
-				backTop: {
-					"src": "../../static/top.png",
-					"scrollTop": 0
-				}
-			};
-		},
-		computed: {
-			...mapState(['hasLogin', 'forcedLogin', 'jyyUser'])
-		},
-		onLoad(e) {
-			index = 1;
-			if (!this.hasLogin) {
-				uni.navigateTo({
-					url: '../login/login',
-				});
-			} else {
-				this.windowHeight = uni.getSystemInfoSync().windowHeight;
-				this.user = JSON.parse(this.jyyUser);
-				this.getCategory();
-				this.getData();
-				if (e.n > 4) {
-					setTimeout(() => {
-						this.public(e.n, e);
-					}, 200);
-				}
-			}
-		},
-		onPageScroll(e) {
-			this.backTop.scrollTop = e.scrollTop;
-			util.loads(this.products, 'list', this.windowHeight);
-			uni.createSelectorQuery()
-				.selectAll('#list')
-				.boundingClientRect(datas => {
-					this.sortNavfixed = parseInt(datas[0].top) < 78 ? true : false;
-				})
-				.exec();
-		},
-		onPullDownRefresh() {
-			this.getData();
-			setTimeout(function() {
-				uni.stopPullDownRefresh();
-			}, 1000);
-		},
-		onReachBottom() {
-			this.getData();
-		},
-		methods: {
-			setKey(e) {
-				this.sliderIndex = e;
-			},
-			hidesliderPopup() {
-				this.showSlider = false;
-			},
-			set(productId, ratio, share) {
-				uni.request({
-					url: this.webUrl + 'SetUserRatio',
-					method: 'POST',
-					header: {
-						'content-type': 'application/x-www-form-urlencoded'
-					},
-					data: {
-						userid: this.user.id,
-						setid: this.userid,
-						productId: productId,
-						price: share,
-						ratio: ratio.toFixed(2)
-					},
-					success: res => {
-						uni.showLoading({
-							title: res.data.result.resultInfo,
-							icon: "none"
-						});
-						setTimeout(function() {
-							uni.hideLoading();
-						}, 500);
-					},
-					fail: () => {
-						mescroll.endErr();
-					},
-					complete: () => {}
-				});
-			},
-			sliderChange(e) {
-				let index;
-				// #ifndef H5
-				index = e.currentTarget.id;
-				// #endif
-				// #ifdef H5
-				index = this.sliderIndex;
-				// #endif
-				this.products[index].share = parseInt((this.products[index].salePrice - this.products[index].costPrice) * e.detail.value /
-					100);
-				this.set(this.products[index].id, e.detail.value / 100, this.products[index].share);
-			},
-			focus() {
-				this.active = true;
-				//HM修改 增加获取焦点判断
-				if (this.key != '') {
-					this.isDelShow = true;
-				}
-			},
-			inputChange(event) {
-				var keyword = event.detail.value;
-				this.$emit('input', keyword);
-				if (this.key) {
-					this.isDelShow = true;
-				}
-			},
-			blur() {
-				this.isFocus = false;
-				if (!this.key) {
-					this.active = false;
-				}
-			},
-			clear() {
-				//HM修改 收起键盘
-				uni.hideKeyboard();
-				this.isFocus = false;
-				this.key = '';
-				this.active = false;
-				//HM修改 清空内容时候触发组件input
-				this.isDelShow = false;
-			},
-			search() {
-				index = 1;
-				this.loadingType = 0;
-				this.products = [];
-				this.getData();
-			},
-			getData() {
-				if (this.loadingType !== 0) {
-					return;
-				}
-				uni.request({
-					url: this.webUrl + 'List',
-					method: 'POST',
-					header: {
-						'content-type': 'application/x-www-form-urlencoded'
-					},
-					data: {
-						pageNum: index,
-						id: this.id,
-						userid: this.user.id,
-						key: this.key,
-						setid: this.userid
-					},
-					success: res => {
-						if (res.data.result.ratioProducts.length > 0) {
-							this.products = this.products.concat(res.data.result.ratioProducts);
-							setTimeout(() => {
-								util.loads(this.products, 'list', this.windowHeight);
-							}, 500)
-						} else {
-							this.loadingType = 2;
-							return;
-						}
-						if (index == parseInt(res.data.result.pages)) {
-							this.loadingType = 2;
-							return;
-						} else {
-							this.loadingType = 0;
-						}
-						index++;
-					},
-					fail: () => {},
-					complete: () => {}
-				});
-			},
-			getElSize(id) {
-				//得到元素的size
-				return new Promise((res, rej) => {
-					uni.createSelectorQuery()
-						.select('#' + id)
-						.fields({
-								size: true,
-								scrollOffset: true
-							},
-							data => {
-								res(data);
-							}
-						)
-						.exec();
-				});
-			},
-			async public(i, e) {
-				this.id = e.no;
-				let index = i;
-				let tabBars = await this.getElSize('tab-bars'),
-					tabBarScrollLeft = tabBars.scrollLeft; //点击的时候记录并设置scrollLeft
-				let width = 0;
-				for (let j = 0; j < index; j++) {
-					let result = await this.getElSize('tab' + this.categorys[j].id);
-					width += result.width;
-				}
-				let winWidth = uni.getSystemInfoSync().windowWidth,
-					nowElement = await this.getElSize('tab' + this.categorys[index].id),
-					nowWidth = nowElement.width;
-				if (width + nowWidth - tabBarScrollLeft > winWidth - nowWidth) {
-					this.scrollLeft = width + nowWidth * 3 - winWidth;
-				}
-
-				if (width < tabBarScrollLeft) {
-					this.scrollLeft = width;
-				}
-			},
-			changeTab(i, e) {
-				if (this.curIndex === i) {
-					return false;
-				} else {
-					this.public(i, e);
-					this.isClickChange = true;
-					this.curIndex = i;
-					index = 1;
-					this.loadingType = 0;
-					this.products = [];
-					this.getData();
-					setTimeout(() => {
-						util.loads(this.products, 'list', this.windowHeight);
-					}, 500)
-
-				}
-			},
-			imageOnLoad(e) {
-				e.loaded = true;
-			},
-			getCategory() {
-				uni.request({
-					url: this.webUrl + 'Categorys',
-					method: 'POST',
-					header: {
-						'content-type': 'application/x-www-form-urlencoded'
-					},
-					success: res => {
-						this.cates = this.cates.concat(res.data.result.uniClassifys);
-						this.categorys = this.categorys.concat(res.data.result.categorys);
-					},
-					fail: () => {},
-					complete: () => {}
-				});
-			},
-			goAgentPriduct: function(e) {
-				uni.navigateTo({
-					url: 'product?id=' + e.id
-				});
-			}
-		}
-	};
-</script>
-
-<style>
-	.tab-search {
-		position: fixed;
-		width: 100%;
-		z-index: 9999;
-	}
-
-	.jz_myfit.jz_lists scroll-view.uni-swiper-tab {
-		margin-bottom: 0;
-	}
-	.jz_myfit .myfit-product .product-img{
-		width: 180upx;
-		height: 180upx;
-		margin-right: 20upx;
-		margin-top: 17.5upx;
-	}
-	.jz_myfit .myfit-product image{
-		width: 180upx;
-		height: 180upx;
-		border-radius: 20upx;
-	}
-
-
-	/* #ifdef H5 */
-	.myfit-slider input {
-		display: block;
-		text-align: center;
-		width: 200upx;
-		background: #dd0101;
-		color: #FFFFFF;
-		border-radius: 30upx;
-		font-size: 26upx;
-	}
-
-	.myfit-slider>view:last-child {
-		margin-right: 10upx;
-	}
-
-	/* #endif */
-
-
-	slider {
-		display: inline;
-		margin-left: 0;
-		margin-right: 0;
-	}
-
-	.jz_agent.jz_myfit .agent-product {
-		margin-top: 280upx;
-	}
-
-	.jz_myfit .myfit-product {
-		padding: 10upx;
-	}
-	
-	.jz_myfit .product-contents{
-		padding: 25upx 0;
-		width: auto!important;
-		margin-left: 0!important;
-	}
-
-	.fixed {
-		width: 100%;
-		position: fixed;
-		left: 0;
-		top: 0;
-		/* #ifdef H5 */
-		/* top: 84upx; */
-		top: 44px;
-		/* #endif */
-		background: #ffffff;
-		margin: 0 !import;
-		z-index: 999;
-		box-sizing: border-box;
-		border-bottom: 2upx solid #eeeeee;
-		transform: translateZ(0);
-		-webkit-transform: translateZ(0);
-	}
-
-	.activeLine {
-		border-bottom: 2upx solid #ff273c;
-	}
-
-	.jz_lists {
-		position: relative;
-	}
-
-
-	.jz_lists scroll-view.uni-swiper-tab {
-		border-bottom: 0;
-		height: auto;
-		line-height: auto;
-		padding-top: 20upx;
-	}
-
-	.jz_lists .productTitle-item {
-		justify-content: center;
-		align-items: center;
-	}
-
-	.jz_lists .productTitle-item .picname {
-		line-height: 60upx;
-	}
-
-	.jz_lists .productTitle-item image {
-		width: 50upx;
-		height: 50upx;
-	}
-
-	.lists .sortNav .Nav:first-child {
-		/* border-left: none; */
-	}
-
-	.list .tab-bar-wrap {
-		width: 200upx;
-	}
-
-	::-webkit-scrollbar {
-		display: none;
-	}
-
-	.lists .nav-left {
-		width: 218upx;
-		border-right: solid 1upx #e0e0e0;
-		padding-top: 20upx;
-		box-sizing: border-box;
-	}
-
-	.lists .nav-left .nav-left-title {
-		height: 80upx;
-		font-weight: 600;
-		margin: 0 auto;
-		margin-left: 10upx;
-	}
-
-	.lists .nav-left-item {
-		height: 110upx;
-		font-size: 30upx;
-		display: flex;
-		align-items: center;
-		justify-content: center;
-	}
-
-	.lists .nav-left-item image {
-		width: 40upx;
-		height: 40upx;
-		margin-right: 18upx;
-	}
-
-	.lists .nav-right {
-		width: 100%;
-		box-sizing: border-box;
-	}
-
-	.uni-tab-bar-loading {
-		width: 100%;
-	}
-
-	.uni-tab-bar-loading .loading-text {
-		margin-top: 50upx;
-		font-size: 28upx;
-		text-align: center;
-	}
-
-	.lists .list {
-		width: 100%;
-		height: 92%;
-	}
-
-
-	#tab-bar {
-		background-color: #ffffff;
-		padding-bottom: 60upx;
-		overflow: hidden;
-	}
-
-	.uni-tab-bar .active {
-		color: #ffe200;
-		/* border-left: 10upx solid #ffe200; */
-	}
-
-
-	.prices .prices-cart image {
-		width: 52upx;
-		height: 50upx;
-		margin-right: 10upx;
-	}
-
-	.prices .prices-salePrice {
-		font-size: 22upx;
-		color: #f00000;
-	}
-
-
-	.image {
-		position: absolute;
-		width: 100%;
-		height: 100%;
-	}
-
-
-	.list-collapse {
-		padding-left: 36upx;
-		box-sizing: border-box;
-	}
-
-
-	.lists .sortNav .navActive {
-		color: #d80000;
-	}
-</style>

pages/user/register/register.1.vue

@@ -1,201 +0,0 @@
-<template>
-
-	<view class="login uni-flex uni-column register">
-		<view class="uni-flex login-top" @click="Home">
-			<image mode="widthFix" src="../../../static/login/login_bg.png"></image>
-		</view>
-		<view class="login-bottom uni-flex-item uni-column uni-flex">
-			<view class="login-form uni-flex uni-column">
-				<view class="logoImg uni-flex">
-					<image src="../../../static/login/login_logo.png"></image>
-				</view>
-				<view class="tab uni-flex uni-flex-item uni-column">
-					<view class="content uni-flex-item">
-						<view>
-							<view class="form-phone uni-flex">
-								<view class="form-phone-lf uni-flex">
-									<image src="../../../static/login/ico1.png"></image>
-								</view>
-								<input class="uni-flex-item userNameIput" placeholder-style="color:#e2e2e2" v-model="phone" name="input"
-								 placeholder="输入手机号码" />
-							</view>
-							<view class="form-phone uni-flex">
-								<view class="form-phone-lf uni-flex">
-									<image src="../../../static/login/ico2.png"></image>
-								</view>
-								<input class="uni-flex-item userNameIput" placeholder-style="color:#e2e2e2" v-model="password" name="input"
-								 placeholder="输入登录密码" />
-							</view>
-							<view class="form-phone uni-flex">
-								<view class="form-phone-lf uni-flex">
-									<image src="../../../static/login/ico2.png"></image>
-								</view>
-								<input class="uni-flex-item userNameIput" placeholder-style="color:#e2e2e2" v-model="password" name="input"
-								 placeholder="确认登录密码" />
-							</view>
-							<view class="form-phone uni-flex">
-								<view class="form-phone-lf uni-flex">
-									<image src="../../../static/login/login_message.png"></image>
-								</view>
-								<input class="uni-flex-item userNameIput" placeholder-style="color:#e2e2e2" v-model="password" name="input"
-								 placeholder="输入短信验证码" />
-								<view class="codeBtn">
-									获取验证码
-								</view>
-							</view>
-						</view>
-					</view>
-
-				</view>
-				<view class="btnImg">
-					<image src="../../../static/login/login_btn.png"></image>
-				</view>
-			</view>
-			<view class="login-tip uni-flex">
-				<view class="registerMsg">已有账号登录</view>
-			</view>
-		</view>
-	</view>
-
-</template>
-
-<script>
-	import {
-		mapState,
-		mapMutations
-	} from 'vuex'
-
-	export default {
-		data() {
-			return {
-				userName: "",
-				code: "",
-				vcode: "",
-				content: '发送验证码',
-				totalTime: 10,
-				type: "primary",
-				canClick: true
-
-			};
-		},
-		onLoad(e) {
-			this.id = e.id;
-		},
-		onPullDownRefresh() {
-			setTimeout(function() {
-				uni.stopPullDownRefresh();
-			}, 1000);
-		},
-		methods: {
-			...mapMutations(['login']),
-			Register() {
-				if (this.userName == "") {
-					uni.showToast({
-						icon: "none",
-						title: "请填写手机号",
-					});
-					return false;
-				}
-				if (this.code == "") {
-					uni.showToast({
-						icon: "none",
-						title: "请填写验证码",
-					});
-					return false;
-				}
-				// 				if (this.no == "") {
-				// 					uni.showToast({
-				// 						icon: "none",
-				// 						title: "请填写激活码",
-				// 					});
-				// 					return false;
-				// 				}
-				uni.showLoading({
-					title: "注册中"
-				});
-				uni.request({
-					url: this.webUrl + 'Register',
-					method: 'POST',
-					data: {
-						id: this.id,
-						userName: this.userName,
-						code: this.code,
-						vcode: this.vcode
-						// no: this.no
-					},
-					header: {
-						'content-type': 'application/x-www-form-urlencoded'
-					},
-					success: res => {
-						uni.hideLoading();
-						if (res.data.result.isSuccess) {
-							this.login(JSON.stringify(res.data.user));
-							uni.switchTab({
-								url: '../user/user'
-							});
-						} else {
-							uni.showToast({
-								icon: "none",
-								title: res.data.result.resultInfo,
-							})
-						}
-					},
-					fail: () => {},
-					complete: () => {}
-				});
-
-			},
-			SendEsms() {
-				if (this.userName == "") {
-					uni.showToast({
-						icon: "none",
-						title: "请填写手机号码",
-					})
-				} else {
-					if (!this.canClick) return //改动的是这两行代码
-					uni.showLoading({
-						title: "发送中"
-					});
-					uni.request({
-						url: this.webUrl + 'SendEsms',
-						method: 'POST',
-						data: {
-							mobile: this.userName
-						},
-						header: {
-							'content-type': 'application/x-www-form-urlencoded'
-						},
-						success: res => {
-							uni.hideLoading()
-							if (res.data.result.status == "1") {
-								this.vcode = res.data.result.code;
-								this.canClick = false
-								this.type = "default";
-								this.content = this.totalTime + 's'
-								let clock = setInterval(() => {
-									this.totalTime--
-									this.content = this.totalTime + 's'
-									if (this.totalTime < 0) {
-										clearInterval(clock)
-										this.content = '重新发送'
-										this.totalTime = 10
-										this.canClick = false //这里重新开启
-										this.type = "primary"
-									}
-								}, 1000)
-
-							} else {
-								uni.showToast({
-									icon: "none",
-									title: "发送失败",
-								})
-							}
-						},
-						fail: () => {},
-						complete: () => {}
-					});
-				}
-			}
-		}
-	}
-</script>

pages/user/register/register.vue

@@ -1,266 +0,0 @@
-<template>
-
-	<view class="jz_login jz_register">
-		<view class="uni-flex login-top" @click="Home">
-			<image mode="widthFix" src="../../../static/login/login_bg.png"></image>
-			<div class="waveWrapper waveAnimation">
-
-				<div class="circles">
-					<div class="circle"></div>
-					<div class="circle"></div>
-					<div class="circle"></div>
-					<div class="circle"></div>
-					<div class="circle"></div>
-					<div class="circle"></div>
-					<div class="circle"></div>
-				</div>
-
-
-			</div>
-		</view>
-		<view class=" space"></view>
-		<view class="login-box uni-column ">
-			<view class="login-form uni-flex uni-column">
-				<view class="logoImg uni-flex" @click="Home">
-					<image src="../../../static/login/login_logo.png"></image>
-				</view>
-				<view class="tab uni-flex uni-flex-item uni-column">
-
-					<view class="uni-flex content uni-flex-item">
-						<view class="uni-flex uni-column">
-							<view class="form-phone uni-flex">
-								<view class="form-phone-lf uni-flex">
-									<image src="../../../static/login/ico1.png"></image>
-								</view>
-								<input class="uni-flex-item userNameIput" placeholder-style="color:#e2e2e2" v-model="phone" name="input"
-								 placeholder="输入手机号码" />
-							</view>
-							<view class="form-phone uni-flex">
-								<view class="form-phone-lf uni-flex">
-									<image src="../../../static/login/ico2.png"></image>
-								</view>
-								<input class="uni-flex-item userNameIput" password placeholder-style="color:#e2e2e2" v-model="password1" name="input"
-								 placeholder="输入登录密码" />
-							</view>
-							<view class="form-phone uni-flex">
-								<view class="form-phone-lf uni-flex">
-									<image src="../../../static/login/ico2.png"></image>
-								</view>
-								<input class="uni-flex-item userNameIput" password placeholder-style="color:#e2e2e2" v-model="password2" name="input"
-								 placeholder="确认登录密码" />
-							</view>
-							<view class="form-phone uni-flex">
-								<view class="form-phone-lf uni-flex">
-									<image src="../../../static/login/login_message.png"></image>
-								</view>
-								<input class="uni-flex-item userNameIput" placeholder-style="color:#e2e2e2" v-model="code" name="input"
-								 placeholder="输入短信验证码" />
-								<view class="codeBtn uni-flex" >
-									<button class="send uni-flex-item" :type="type" size="mini" @click="SendEsms">{{content}}</button>
-								</view>
-							</view>
-						</view>
-					</view>
-
-				</view>
-				<view class="btnImg" @click="Register">
-					注册
-				</view>
-			</view>
-			<view class="login-tip uni-flex">
-				<view class="registerMsg" @click="goRegister">已有账号登录</view>
-			</view>
-		</view>
-	</view>
-
-</template>
-
-<script>
-	import {
-		mapState,
-		mapMutations
-	} from 'vuex'
-	import sha1 from '../../../common/sha1.js';
-
-	export default {
-		computed: {
-			...mapState(['hasLogin', 'forcedLogin', 'jyyUser', 'favs', 'shareId'])
-		},
-		data() {
-			return {
-				phone: "",
-				code: "",
-				vcode: "",
-				password1: "",
-				password2: "",
-				content: '发送验证码',
-				totalTime: 10,
-				type: "primary",
-				canClick: true,
-				shareId: 0
-			};
-		},
-		onLoad() {
-			this.init();
-		},
-		onPullDownRefresh() {
-			setTimeout(function() {
-				uni.stopPullDownRefresh();
-			}, 1000);
-		},
-		methods: {
-			...mapMutations(['login', 'setFavs', 'setShare']),
-			goRegister(){
-				uni.navigateTo({
-					url:'../login/login'
-				})
-			},
-			init() {
-				if (!this.hasLogin) {
-					uni.getStorage({
-						key: 'shareUserId',
-						success: (res) => {
-							this.shareId = res.data;
-							console.log(this.shareId)
-						}
-					});
-				}
-			},
-			Register() {
-				if (this.phone == "") {
-					uni.showToast({
-						icon: "none",
-						title: "请填写手机号",
-					});
-					return false;
-				}
-				if (this.password1 == "") {
-					uni.showToast({
-						icon: "none",
-						title: "请输入登录密码",
-					});
-					return false;
-				}
-				if (this.password2 == "") {
-					uni.showToast({
-						icon: "none",
-						title: "请确认登录密码",
-					});
-					return false;
-				}
-				if (this.code == "") {
-					uni.showToast({
-						icon: "none",
-						title: "请填写验证码",
-					});
-					return false;
-				}
-				uni.showLoading({
-					title: "注册中"
-				});
-				uni.request({
-					url: this.webUrl + 'Register',
-					method: 'POST',
-					data: {
-						phone: this.phone,
-						pass1: sha1.hex_sha1(this.password1),
-						pass2: sha1.hex_sha1(this.password2),
-						shareId: this.shareId,
-						code: this.code,
-						vcode: this.vcode
-					},
-					header: {
-						'content-type': 'application/x-www-form-urlencoded'
-					},
-					success: res => {
-						uni.hideLoading();
-						if (res.data.result.isSuccess) {
-							this.login(JSON.stringify(res.data.user));
-							this.setFavs(JSON.stringify(res.data.favs));
-							uni.switchTab({
-								url: '../user/user'
-							});
-						} else {
-							uni.showToast({
-								icon: "none",
-								title: res.data.result.resultInfo,
-							})
-						}
-					},
-					fail: () => {},
-					complete: () => {}
-				});
-
-			},
-			Home() {
-				uni.switchTab({
-					url: '../../home/home'
-				})
-			},
-			SendEsms() {
-				if (this.phone == "") {
-					uni.showToast({
-						icon: "none",
-						title: "请填写手机号码",
-					})
-				} else {
-					console.log(this.canClick)
-					if (!this.canClick) return //改动的是这两行代码
-					uni.showLoading({
-						title: "发送中"
-					});
-					uni.request({
-						url: this.webUrl + 'SendEsms',
-						method: 'POST',
-						data: {
-							mobile: this.phone
-						},
-						header: {
-							'content-type': 'application/x-www-form-urlencoded'
-						},
-						success: res => {
-							uni.hideLoading()
-							if (res.data.result.status == "1") {
-								this.vcode = res.data.result.code;
-								this.canClick = false
-								this.type = "default";
-								this.content = this.totalTime + 's'
-								let clock = setInterval(() => {
-									this.totalTime--
-									this.content = this.totalTime + 's'
-									if (this.totalTime < 0) {
-										clearInterval(clock)
-										this.content = '重新发送'
-										this.totalTime = 10
-										this.canClick = true //这里重新开启
-										this.type = "primary"
-									}
-								}, 1000)
-
-							} else {
-								uni.showToast({
-									icon: "none",
-									title: "发送失败",
-								})
-							}
-						},
-						fail: () => {},
-						complete: () => {}
-					});
-				}
-			}
-		}
-	}
-</script>
-<style>
-	.jz_login .btnImg {
-		width: 460upx;
-		height: 80upx;
-		text-align: center;
-		line-height: 80upx;
-		font-size: 24upx;
-		color: #FFFFFF;
-		background: url(../../../static/btn.png) no-repeat;
-		background-size: 460upx 80upx;
-	}
-</style>

pages/user/spreadCost/spreadCost.vue

@@ -1,103 +0,0 @@
-<template>
-	<view class="uni-flex uni-column">
-		<view class="spreadCost-wrap uni-flex justify-content align-items uni-column">
-			<view class="uni-flex-item">推广总额</view>
-			<view class="uni-flex-item spreadCost">0.00</view>
-		</view>
-		<view class="uni-list">
-			<view class="uni-list-cell">
-				<view class="uni-list-cell-navigate">
-					未确认推广费：<text class="number">￥{{count1}}</text>
-				</view>
-			</view>
-			<view class="uni-list-cell">
-				<view class="uni-list-cell-navigate">
-					已确认推广费：<text class="number">￥{{count2}}</text>
-				</view>
-			</view>
-		</view>
-	</view>
-</template>
-
-<script>
-	import {
-		mapState,
-		mapMutations
-	} from 'vuex'
-
-
-	export default {
-		computed: {
-			...mapState(['hasLogin', 'forcedLogin', 'jyyUser'])
-		},
-		data() {
-			return {
-				user: {},
-				count1: 0,
-				count2: 0,
-			}
-		},
-		onLoad() {
-			this.init();
-		},
-		methods: {
-			init() {
-				if (!this.hasLogin) {
-					uni.navigateTo({
-						url: '../login/login',
-					});
-				} else {
-					this.user = JSON.parse(this.jyyUser);
-					this.getData();
-				}
-			},
-			getData(){
-				uni.request({
-					url: this.webUrl + 'MyOrdersCount',
-					method: 'POST',
-					data: {
-						userid: this.user.id
-					},
-					header: {
-						'content-type': 'application/x-www-form-urlencoded'
-					},
-					success: res => {
-						this.count1 = res.data.result.resultInfo;
-						this.count2 = res.data.result.resultInfo2;			
-					},
-					fail: () => {},
-					complete: () => {}
-				});
-			}
-			
-		}
-	}
-</script>
-<style>
-	.spreadCost-wrap {
-		height: 130upx;
-		text-align: center;
-		line-height: 80upx;
-		background: #FFFFFF;
-	}
-
-	.uni-list-cell:after {
-		background: none;
-	}
-
-	.spreadCost-wrap .spreadCost {
-		margin-top: -30upx;
-	}
-
-	.spreadCost-wrap .number {
-		margin-right: 20upx;
-	}
-
-	.spreadCostBtn {
-		margin-top: 15upx;
-		width: 95%;
-		text-align: center;
-		color: #FFFFFF;
-		background: #4cda64;
-	}
-</style>

pages/user/spreadOrder/mySpreadOrder.vue

@@ -1,124 +0,0 @@
-<template>
-	<view class="uni-flex uni-column myuser">
-		<view class="uni-list">
-			<view class="content">
-				<view v-for="(item,key) in orders" :key="key" class="uni-flex justify-content">
-					<view class="uni-product uni-flex">
-						<view class="image-view">
-							<image class="uni-product-image" :src="item.avatarUrl" />
-						</view>
-						<view class="uni-product-wrap uni-flex uni-column">
-							<view class="nick">昵称：<text>{{item.nickName}}</text></view>
-							<view class="orders">订单：{{item.orderNo}}</view>
-							<view class="spreadMoney">金额/推广费：<text>{{item.subTotal}}/{{item.amount}}</text><text v-if="item.state==0">未确认</text><text
-								 v-if="item.state==1">已确认</text></view>
-							<view class="orderTime">下单时间：<text>{{item.createDate}}</text></view>
-						</view>
-					</view>
-				</view>
-
-			</view>
-
-		</view>
-		<load-more :loadingType="loadingType" :contentText="contentText"></load-more>
-	</view>
-</template>
-
-<script>
-	import {
-		mapState,
-		mapMutations
-	} from 'vuex'
-	import loadMore from '@/components/uni-load-more.vue';
-	var index;
-	export default {
-		computed: {
-			...mapState(['hasLogin', 'forcedLogin', 'jyyUser'])
-		},
-		data() {
-			return {
-				orders: [],
-				loadingType: 0,
-				contentText: {
-					contentdown: "上拉显示更多",
-					contentrefresh: "正在加载...",
-					contentnomore: "没有更多数据了"
-				}
-			};
-		},
-		onPullDownRefresh() {
-			this.init();
-			setTimeout(function() {
-				uni.stopPullDownRefresh();
-			}, 1000);
-		},
-		onShow() {
-			this.init();
-		},
-		onLoad(e) {
-			this.rank = e.rank;
-			this.init();
-		},
-		methods: {
-			init() {
-				index = 1;
-				if (!this.hasLogin) {
-					uni.navigateTo({
-						url: '../login/login',
-					});
-				} else {
-					this.getData();
-				}
-			},
-			getData() {
-				if (this.loadingType !== 0) {
-					return;
-				}
-				this.loadingType = 1;
-				let user = JSON.parse(this.jyyUser);
-				uni.request({
-					url: this.webUrl + 'MyOrders',
-					method: 'POST',
-					data: {
-						pageIndex: index,
-						userid: user.id,
-					},
-					header: {
-						'content-type': 'application/x-www-form-urlencoded'
-					},
-					success: res => {
-						if (res.data.result.uniMoneyLogList.length > 0) {
-							this.orders = this.orders.concat(res.data.result.uniMoneyLogList);
-						} else {
-							this.loadingType = 2;
-							return;
-						}
-						if (index == parseInt(res.data.result.pages)) {
-							this.loadingType = 2;
-							return;
-						} else {
-							this.loadingType = 0;
-						}
-						index++;
-					},
-					fail: () => {},
-					complete: () => {}
-				});
-			},
-		},
-		onReachBottom() {
-			this.getData();
-		},
-		components: {
-			loadMore
-		}
-	}
-</script>
-<style>
-	.myuser .orders {
-		width: 350upx;
-		overflow: hidden;
-		text-overflow: ellipsis;
-		white-space: nowrap
-	}
-</style>

pages/user/spreadOrder/mymember.vue

@@ -1,50 +0,0 @@
-<template>
-	<view class="uni-flex uni-column mymember">
-		<view class="myuser">我的会员</view>
-		<view class="uni-list">
-			<view class="uni-list-cell">
-				<view class="uni-list-cell-navigate uni-navigate-right" @click="goBuyUser()">
-					一级会员<text class="number">0</text>
-				</view>
-			</view>
-			<view class="uni-list-cell">
-				<view class="uni-list-cell-navigate uni-navigate-right" @click="goBuyUser()">
-					二级会员<text class="number">0</text>
-				</view>
-			</view>
-			<view class="uni-list-cell">
-				<view class="uni-list-cell-navigate uni-navigate-right" @click="goBuyUser()">
-					三级会员<text class="number">0</text>
-				</view>
-			</view>
-		</view>
-	</view>
-</template>
-
-<script>
-	export default {
-		data() {
-			return {
-			}
-		},
-		onShow() {},
-		onLoad(e) {},
-		methods: {
-			goBuyUser() {
-				uni.navigateTo({
-					url: "./mySpreadOrder"
-				})
-			}
-		}
-	}
-</script>
-<style>
-	.myuser {
-		height: 80upx;
-		text-align: center;
-		line-height: 80upx;
-	}
-	.mymember .number {
-		margin-right: 20upx;
-	}
-</style>

pages/user/user/user.vue

@@ -1,391 +0,0 @@
-<template>
-	<view class="uni-flex jz_user uni-column">
-		<view class="user-header">
-			<view class="uni-flex userinfo">
-				<view class="inforlf uni-flex">
-					<view class="face uni-flex">
-						<image v-if="user.avatarUrl != null" :src="user.avatarUrl"></image>
-						<image v-if="user.avatarUrl == null" src="../../../static/user/02.png"></image>
-					</view>
-					<view class="username uni-flex uni-column">
-						<view class="uname">{{ user.nickName }}</view>
-						<view class="utime">上次登录时间：23:00:00</view>
-					</view>
-				</view>
-				<view class="inforrt uni-flex uni-column" @click="bindLogout">
-					<image src="../../../static/user/03.png"></image>
-					<view>退出登录</view>
-				</view>
-			</view>
-			<view class="userlist uni-flex">
-				<navigator url="../fav/fav" class="useritem uni-flex uni-column">
-					<view>{{ userbase.fav }}</view>
-					<view>我的收藏</view>
-				</navigator>
-				<view class="line"></view>
-				<navigator class="useritem uni-flex uni-column" :url="'../myPoint/myPoint?integral=' + userbase.integral">
-					<view>{{ userbase.integral }}</view>
-					<view>我的积分</view>
-				</navigator>
-				<view v-if="user.business > 0" class="line"></view>
-				<navigator v-if="user.business > 0" url="../myuser/mymember" class="useritem uni-flex uni-column">
-					<view>{{ userbase.myUser }}</view>
-					<view>我的会员</view>
-				</navigator>
-			</view>
-		</view>
-		<view class="user-content uni-flex-item">
-			<view class="userbox uni-flex">
-				<view class="uni-flex boxlf" @click="goAgent">
-					<image src="../../../static/user/04.png"></image>
-					<view class="uni-flex uni-column titles">
-						<view class="titlestop">代理查询</view>
-						<view class="titlesbottom">查询区域代理</view>
-					</view>
-				</view>
-				<view class="boxline"></view>
-				<view class="uni-flex boxlf" @click="goMyAgency">
-					<image src="../../../static/user/flash.gif"></image>
-					<view class="uni-flex uni-column titles">
-						<view class="titlestop">快速下单</view>
-						<view class="titlesbottom">代理商品一键下单</view>
-					</view>
-				</view>
-			</view>
-			<view class="orders uni-flex uni-column">
-				<view class="uni-list-cell">
-					<view class="uni-list-cell-navigate uni-navigate-right uni-flex">
-						<view class="myorder">我的订单</view>
-						<view class="lookall" @click="goAllOrder">查看全部订单</view>
-					</view>
-				</view>
-				<view class="uni-flex orderList uni-flex-item">
-					<navigator url="../orderList/orderList?tab=1" class="orderitem uni-flex uni-column">
-						<image src="../../../static/user/06.png"></image>
-						<view class="">待付款</view>
-						<view class="badge" v-if="userbase.orderPay > 0">{{ userbase.orderPay }}</view>
-					</navigator>
-					<navigator url="../orderList/orderList?tab=2" class="orderitem uni-flex uni-column">
-						<image src="../../../static/user/07.png"></image>
-						<view class="">待发货</view>
-						<view class="badge" v-if="userbase.orderShipments > 0">{{ userbase.orderShipments }}</view>
-					</navigator>
-					<navigator url="../orderList/orderList?tab=3" class="orderitem uni-flex uni-column">
-						<image src="../../../static/user/08.png"></image>
-						<view class="">待收货</view>
-						<view class="badge" v-if="userbase.orderReceiving > 0">{{ userbase.orderReceiving }}</view>
-					</navigator>
-					<navigator url="../orderList/orderList?tab=4" class="orderitem uni-flex uni-column">
-						<image src="../../../static/user/09.png"></image>
-						<view class="">退款/售后</view>
-						<view class="badge badgeF" v-if="userbase.orderReturn > 0">{{ userbase.orderReturn }}</view>
-					</navigator>
-					<navigator url="../orderList/orderList?tab=0" class="orderitem uni-flex uni-column">
-						<image src="../../../static/user/10.png"></image>
-						<view>全部订单</view>
-					</navigator>
-				</view>
-			</view>
-			<view class="card uni-flex uni-column">
-				<view v-if="user.business > 0" class="uni-list">
-					<navigator url="../myAgency/index" hover-class="navigator-hover">
-						<view class="uni-list-cell">
-							<view class="uni-list-cell-navigate uni-flex firstcell">
-								<view class="listmsg uni-flex align-items">
-									<image class="listleft" src="../../../static/user/agency.png"></image>
-									<text class="">我的代理</text>
-								</view>
-								<view class="uni-flex align-items">
-									<text class="num">{{userbase.myAgency}}</text>
-									<image class="listrt" src="../../../static/user/14.png"></image>
-								</view>
-							</view>
-						</view>
-					</navigator>
-				</view>
-
-				<!-- <view v-if="user.business>0" class="uni-list">
-					<navigator url="../agent/index" hover-class="navigator-hover">
-						<view class="uni-list-cell">
-							<view class="uni-list-cell-navigate uni-flex">
-
-								<view class="listmsg uni-flex align-items">
-									<image class="listleft" src="../../../static/user/04.png"></image>
-									<text class="">代理查询</text>
-								</view>
-								<image class="listrt" src="../../../static/user/14.png"></image>
-							</view>
-						</view>
-					</navigator>
-				</view> -->
-				<view v-if="user.business > 0" class="uni-list">
-					<navigator url="../myuser/mymember" hover-class="navigator-hover">
-						<view class="uni-list-cell">
-							<view class="uni-list-cell-navigate uni-flex">
-								<view class="listmsg uni-flex align-items">
-									<image class="listleft" src="../../../static/user/17.png"></image>
-									<text class="">我的会员</text>
-								</view>
-								<view class="uni-flex align-items">
-									<text class="num">{{userbase.myUser}}</text>
-									<image class="listrt" src="../../../static/user/14.png"></image>
-								</view>
-							</view>
-						</view>
-					</navigator>
-				</view>
-				<view v-if="user.business == 1" class="uni-list">
-					<navigator url="../profit/index" hover-class="navigator-hover">
-						<view class="uni-list-cell">
-							<view class="uni-list-cell-navigate uni-flex">
-								<view class="listmsg uni-flex align-items">
-									<image class="listleft" src="../../../static/user/40.png"></image>
-									<text class="">利润查询</text>
-								</view>
-								<image class="listrt" src="../../../static/user/14.png"></image>
-							</view>
-						</view>
-					</navigator>
-				</view>
-
-				<view v-if="user.business > 0" class="uni-list">
-					<navigator url="../income/income" hover-class="navigator-hover">
-						<view class="uni-list-cell">
-							<view class="uni-list-cell-navigate uni-flex firstcell">
-								<view class="listmsg uni-flex align-items">
-									<image class="listleft" src="../../../static/user/15.png"></image>
-									<text class="">收益明细</text>
-								</view>
-								<image class="listrt" src="../../../static/user/14.png"></image>
-							</view>
-						</view>
-					</navigator>
-				</view>
-				<view v-if="user.business > 0" class="uni-list">
-					<navigator @click="goBeginCard" hover-class="navigator-hover">
-						<view class="uni-list-cell">
-							<view class="uni-list-cell-navigate uni-flex">
-								<view class="listmsg uni-flex align-items">
-									<image class="listleft" src="../../../static/user/16.png"></image>
-									<text class="">开牌申请</text>
-								</view>
-								<image class="listrt" src="../../../static/user/14.png"></image>
-							</view>
-						</view>
-					</navigator>
-				</view>
-
-				<view class="uni-list">
-					<navigator v-if="user.business > 0" @click="goCode" hover-class="navigator-hover">
-						<view class="uni-list-cell">
-							<view class="uni-list-cell-navigate uni-flex">
-								<view class="listmsg uni-flex align-items">
-									<image class="listleft" src="../../../static/user/qr.png"></image>
-									<text class="">推广码</text>
-								</view>
-								<image class="listrt" src="../../../static/user/14.png"></image>
-							</view>
-						</view>
-					</navigator>
-				</view>
-				<view v-if="user.business == 0" class="uni-list">
-					<navigator @click="goAgentFor()" hover-class="navigator-hover">
-						<view class="uni-list-cell">
-							<view class="uni-list-cell-navigate uni-flex">
-								<view class="listmsg uni-flex align-items">
-									<image class="listleft" src="../../../static/user/16.png"></image>
-									<text class="">申请代理</text>
-								</view>
-								<image class="listrt" src="../../../static/user/14.png"></image>
-							</view>
-						</view>
-					</navigator>
-				</view>
-				<view class="uni-list">
-					<navigator url="../account/account" hover-class="navigator-hover firstcell">
-						<view class="uni-list-cell">
-							<view class="uni-list-cell-navigate uni-flex">
-								<view class="listmsg uni-flex align-items">
-									<image class="listleft" src="../../../static/user/11.png"></image>
-									<text class="">个人信息</text>
-								</view>
-								<image class="listrt" src="../../../static/user/14.png"></image>
-							</view>
-						</view>
-					</navigator>
-				</view>
-				<view class="uni-list">
-					<navigator url="../address/address" hover-class="navigator-hover">
-						<view class="uni-list-cell">
-							<view class="uni-list-cell-navigate uni-flex">
-								<view class="listmsg uni-flex align-items">
-									<image class="listleft" src="../../../static/user/12.png"></image>
-									<text class="">收货地址</text>
-								</view>
-								<image class="listrt" src="../../../static/user/14.png"></image>
-							</view>
-						</view>
-					</navigator>
-				</view>
-				<view class="uni-list">
-					<navigator url="../loginPassword/loginPassword" hover-class="navigator-hover">
-						<view class="uni-list-cell">
-							<view class="uni-list-cell-navigate uni-flex">
-								<view class="listmsg uni-flex align-items">
-									<image class="listleft" src="../../../static/user/13.png"></image>
-									<text class="">登录密码</text>
-								</view>
-								<image class="listrt" src="../../../static/user/14.png"></image>
-							</view>
-						</view>
-					</navigator>
-				</view>
-				<view class="uni-list">
-					<navigator @click="bindLogout" hover-class="navigator-hover lastcell">
-						<view class="uni-list-cell">
-							<view class="uni-list-cell-navigate uni-flex">
-								<view class="listmsg uni-flex align-items">
-									<image class="listleft" src="../../../static/user/18.png"></image>
-									<text class="">退出登录</text>
-								</view>
-								<image class="listrt" src="../../../static/user/14.png"></image>
-							</view>
-						</view>
-					</navigator>
-				</view>
-			</view>
-		</view>
-	</view>
-</template>
-
-<script>
-import { mapState, mapMutations } from 'vuex';
-
-export default {
-	computed: {
-		...mapState(['hasLogin', 'forcedLogin', 'jyyUser'])
-	},
-	methods: {
-		...mapMutations(['login', 'logout']),
-		goAllOrder() {
-			uni.navigateTo({
-				url: '../orderList/orderList?tab=0'
-			});
-		},
-		goAgent() {
-			uni.navigateTo({
-				url: '../agent/index'
-			});
-		},
-		goAgentFor() {
-			uni.navigateTo({
-				url: '../agent/applyfor?path=user'
-			});
-		},
-		goCode() {
-			uni.navigateTo({
-				url: '../../qrCode/index?id=' + this.user.id
-			});
-		},
-		goBeginCard() {
-			uni.navigateTo({
-				url: '../beginCard/beginCard'
-			});
-		},
-		bindLogout() {
-			uni.showModal({
-				content: '确认退出？',
-				success: res => {
-					if (res.confirm) {
-						this.logout();
-						uni.switchTab({
-							url: '../../home/home'
-						});
-					}
-				}
-			});
-		},
-		init() {
-			if (!this.hasLogin) {
-				uni.navigateTo({
-					url: '../login/login'
-				});
-			} else {
-				this.user = JSON.parse(this.jyyUser);
-				this.getData();
-
-				uni.request({
-					url: this.webUrl + 'FlashCart',
-					data: 'userid=' + this.user.id + '&id=55,56',
-					method: 'POST',
-					header: {
-						'content-type': 'application/x-www-form-urlencoded'
-					},
-					success: res => {},
-					fail: () => {},
-					complete: () => {}
-				});
-			}
-		},
-		goMyAgency() {
-			uni.navigateTo({
-				url: '../myAgency/index'
-			});
-		},
-		getData() {
-			uni.request({
-				url: this.webUrl + 'GetUserInfo',
-				data: 'userid=' + this.user.id,
-				method: 'POST',
-				header: {
-					'content-type': 'application/x-www-form-urlencoded'
-				},
-				success: res => {
-					this.userbase = res.data.result;
-					this.login(JSON.stringify(res.data.user));
-				},
-				fail: () => {},
-				complete: () => {}
-			});
-		}
-	},
-	onShow() {
-		this.init();
-	},
-	onLoad(e) {
-		this.init();
-	},
-	onPullDownRefresh() {
-		this.init();
-		setTimeout(function() {
-			uni.stopPullDownRefresh();
-		}, 1000);
-	},
-	data() {
-		return {
-			user: {},
-			userbase: {}
-		};
-	}
-};
-</script>
-
-<style>
-.user-header {
-	background: url(../../../static/user/01.png);
-	background-size: 100% 100%;
-}
-
-.boxline {
-	background: url(../../../static/user/line.png) no-repeat;
-}
-
-.jz_income .content_item .item_titles > view:first-child {
-	margin-top: 20upx;
-}
-.num {
-	font-size: 26rpx;
-	color: #ca0000;
-	margin-right: 10upx;
-}
-</style>

pages/visitor/historyList.vue

@@ -117,10 +117,11 @@
 					// if (pullScroll.page == 1) {
 					// 	this.doorData = [];
 					// }
-					this.http.httpRequest('/wxapplet/owner/peolepass/list', 'get', {
-						cardNo: uni.getStorageSync('idNumber'),
+					this.http.httpRequest('/wxapplet/owner/peolepass/visitList', 'get', {
+						phoneNum: uni.getStorageSync('phoneNumber'),
 						pageNum: pullScroll.page,
-						pageSize: 5
+						pageSize: 5,
+						passType:3
 					}).then((res) => {
 						if (res.code == 0) {
 							this.total = res.data.total