sd

src/components/CarsListContent/index.jsx

@@ -36,7 +36,8 @@ export default (props) => {
 
   }
   const goMapInfo = (res) => {
-    Taro.navigateTo({ url: `/pages/CheckMap/index?mapId=${res + 111}` })
+    Taro.navigateTo({ url: `/pages/CheckMap/index?id=${res}&location=${location}` })
+
 
   }
 

src/components/orderRater/index.js

@@ -0,0 +1,88 @@
+import scoreOFF from '../../assets/icons/comm/scoreOFF.png'
+import scoreON from '../../assets/icons/comm/scoreON.png'
+
+Component({
+  /**
+   * 组件的属性列表
+   */
+  properties: {
+    initW: {
+      type: String,
+      value: '100%'
+    },
+    initH: {
+      type: String,
+      value: '100%'
+    },
+    score: {
+      type: Number,
+      value: 0
+    },
+    onlyShow: {
+      type: Boolean,
+      value: false
+    },
+    starW: {
+      type: String,
+      value: '58rpx'
+    },
+    starH: {
+      type: String,
+      value: '55rpx'
+    },
+    stars: {
+      type: Array,
+      value: [
+        {
+          light: scoreON,
+          gray: scoreOFF,
+          // tips: '极差'
+        },
+        {
+          light: scoreON,
+          gray: scoreOFF,
+          // tips: '差'
+        },
+        {
+          light: scoreON,
+          gray: scoreOFF,
+          // tips: '一般'
+        },
+        {
+          light: scoreON,
+          gray: scoreOFF,
+          // tips: '好'
+        },
+        {
+          light: scoreON,
+          gray: scoreOFF,
+          // tips: '极好'
+        },
+
+      ]
+    }
+  },
+
+  data: {
+    initScore: 0
+  },
+
+
+  methods: {
+    clickStar: function (e) {
+      if (this.properties.onlyShow) return
+      let index = e.currentTarget.dataset.index
+      this.setData({
+        initScore: index + 1
+      })
+      this.triggerEvent('raterChange', index + 1)
+
+    }
+  },
+  ready () {
+    this.setData({
+      initScore: this.properties.score
+    })
+    console.log('ready')
+  }
+})

src/components/orderRater/index.json

@@ -0,0 +1,4 @@
+{
+  "component": true,
+  "usingComponents": {}
+}

src/components/orderRater/index.wxml

@@ -0,0 +1,10 @@
+<view class="rater-box" style="width: {{initW}};height: {{initH}}">
+  <view class="rater-item" wx:for="{{stars}}" wx:key="{{index}}">
+    <view class="star-box" bindtap="clickStar" data-index="{{index}}" style="width: {{starW}};height: {{starH}}">
+      <image class="small-icon" src="{{initScore > index ? item.light : item.gray}}"></image>
+    </view>
+    <view class="tips {{initScore > index ? 'active' : ''}}" wx:if="{{item.tips}}">
+      {{item.tips}}
+    </view>
+  </view>
+</view>

src/components/orderRater/index.wxss

@@ -0,0 +1,28 @@
+.rater-box {
+  width: 100%;
+  display: flex;
+  justify-content: space-around;
+  align-items: center;
+  background-color: #fff;
+}
+.rater-item {
+  vertical-align: middle;
+  display: inline-block;
+}
+.star-box {
+  position: relative;
+}
+.small-icon {
+  width: 100%;
+  height: 100%;
+  vertical-align: top;
+}
+.tips {
+  color: #a6a6a6;
+  font-size: 24rpx;
+  text-align: center;
+  line-height: 36rpx;
+}
+.tips.active {
+  color: #816f68;
+}

src/pages/CheckMap/index.jsx

@@ -5,12 +5,17 @@ import ButtontWX from "@/components/ButtontWX"
 import Taro from "@tarojs/taro"
 import locationImage from "@/assets/icons/comm/locationImage.png"
 import addresss from '@/assets/mineImgaes/addresss.png'//地址
+import { getMachineryInfo } from "@/services/homes"
+
 import './style.less'
 
 
 export default (props) => {
 
+
   const $instance = Taro.getCurrentInstance()
+  const { id, location } = $instance.router.params
+
   const [mapLoca, setMapLoca] = useState('')
   Taro.getStorage({
     key: 'location',
@@ -24,11 +29,23 @@ export default (props) => {
   console.log("🚀 ~ file: index.jsx ~ line 25 ~ LocationMap", LocationMap)
 
 
+  const [carsInfo, setCarsInfo] = useState({})
+  const [imagesList, setImagesList] = useState([])
+  const [contentList, setContentList] = useState([])
+
 
   useEffect(() => {
-    console.log($instance.router.params)
 
-  }, [])
+    getMachineryInfo(id, { location: location, attached: true }).then((e) => {
+      setImagesList(e.imagesList)
+      setContentList(e.contentList)
+      setCarsInfo(e)
+
+      console.log('e', e);
+    })
+
+  }, [$instance.router.params, id, location])
+
 
   const startReserve = () => {
     Taro.navigateTo({ url: `/pages/OrderInfo/index?id${1}` })
@@ -67,11 +84,11 @@ export default (props) => {
           >
           </Map>
           <View className='MapBox-centent-BodyArticle'>
-            <Image style={{ width: '100%', borderRadius: '20px 20px 0px 0px' }} src='http://img3.jc001.cn/img/001/1/1512/15566fd0311736f.jpg' />
+            <Image style={{ width: '100%', borderRadius: '20px 20px 0px 0px' }} src={carsInfo.thumb} />
             <View className='CarsContent-TextBox'>
               <View className='CheckDetails-bottom-box-flaxBox-liftText'>
-                <View className='CheckDetails-bottom-box-flaxBox-liftText-Titles'>不知家收割机</View>
-                <View className='CheckDetails-bottom-box-flaxBox-liftText-price'>2188/<Text>公顷</Text></View>
+                <View className='CheckDetails-bottom-box-flaxBox-liftText-Titles'>{carsInfo.name}</View>
+                <View className='CheckDetails-bottom-box-flaxBox-liftText-price'>{carsInfo.price}/<Text>公顷</Text></View>
               </View>
               <View className='content-header-box-map-Info'>
                 <View className='content-header-box-map-Info-liftCentent'>
@@ -79,7 +96,7 @@ export default (props) => {
                   <View>距离当前位置8.8公里&gt;&gt;</View>
                 </View>
               </View>
-              <View className='content-header-box-map-Info-carsName'>农机手小李的收割机</View>
+              <View className='content-header-box-map-Info-carsName'>{carsInfo.orgName}</View>
               <View className='startReserve-centent'>
                 {/* <View className='articleTitle-box-Details'>
                   <Image src={decorate} />

src/pages/FeedbackText/index.jsx

@@ -32,10 +32,8 @@ export default (props) => {
           icon: 'success',
           duration: 2000
         }).then(() => {
-
           setTimeout(() => {
             setLoading(true)
-
             Taro.navigateBack({
               delta: 1
             }

src/pages/MyAddressList/AddressInfos/index.jsx

@@ -63,24 +63,28 @@ export default (props) => {
   }
 
   return (
-
-    <View className='form-content'>
-      <Form onSubmit={formSubmit} onReset={formReset} >
-        <View className='example-body'>
-          <View>详细地址：</View>
-          <Textarea name='address' value={address} className='aTextareaCentent' placeholder='请输入地址信息' />
-        </View>
-        {/* <View className='example-body'>
+    <View className='page-index'>
+      {/* <View className='index-navbar'>
+        <CustomNav title='地址管理' />
+      </View> */}
+
+      <View className='form-content'>
+        <Form onSubmit={formSubmit} onReset={formReset} >
+          <View className='example-body'>
+            <View>详细地址：</View>
+            <Textarea name='address' value={address} className='aTextareaCentent' placeholder='请输入地址信息' />
+          </View>
+          {/* <View className='example-body'>
           <View>是否设为默认地址：</View>
 
           <Switch name='isDefault' onChange={handelSwitch} type='checkbox' />
         </View> */}
-        <View className='buton-bottom'>
-          <ButtontWX onClick={formSubmit} formType='submit' butText='保存' butWidth={315} butHeight={49} butFontSize={16} butBorderRadius={49} />
-        </View>
-      </Form>
+          <View className='buton-bottom'>
+            <ButtontWX onClick={formSubmit} formType='submit' butText='保存' butWidth={315} butHeight={49} butFontSize={16} butBorderRadius={49} />
+          </View>
+        </Form>
 
+      </View>
     </View>
-
   )
 }

src/pages/MyAddressList/AddressInfos/style.less

@@ -1,9 +1,7 @@
 .form-content {
-  width: 100%;
   height: 100%;
-  margin: 40px 30px;
+  margin: 40px auto;
   .example-body {
-    margin-top: 40px;
     > View {
       width: 90%;
 
@@ -31,6 +29,6 @@
   }
   .buton-bottom {
     width: 100%;
-    margin: 85px -40px;
+    margin: 85px auto;
   }
 }

src/pages/MyAddressList/index.config.js

@@ -4,6 +4,7 @@ export default {
   navigationStyle: 'custom',
   disableScroll: true,
   usingComponents: {
+    "mp-orderRater": '../../components/orderRater/index'
   }
 
 

src/pages/MyAddressList/index.jsx

@@ -88,7 +88,10 @@ export default (props) => {
 
   }, [])
 
+  const srcor = (e) => {
+    console.log('评分', e.detail);
 
+  }
 
   return (
     <View className='page-index'>
@@ -97,6 +100,10 @@ export default (props) => {
       </View>
       <scroll-view scrollY style='height: 100%;' >
         <View>
+
+          {/* <mp-orderRater raterChange={srcor} initW='50%' /> */}
+
+
           {
             addresList.map((item, index) => {
               return (
@@ -140,7 +147,6 @@ export default (props) => {
 
           <View className='bottomButtom' >
             <ButtontWX onClick={addAddress} formType='submit' butText='+新增收货地址' butWidth={315} butHeight={49} butFontSize={16} butBorderRadius={49} />
-
           </View>
 
         </View>