xujing 5 年之前
父節點
當前提交
591f173a39

+ 4
- 4
config/prod.js 查看文件

3
     NODE_ENV: '"production"'
3
     NODE_ENV: '"production"'
4
   },
4
   },
5
   defineConstants: {
5
   defineConstants: {
6
-    HOST: '"https://dev.fangdeal.cn"', //测试
7
-    WSS_HOST: '"wss://dev.fangdeal.cn"',
8
-    // HOST: '"https://wx.fangdeal.cn"', //正式
9
-    // WSS_HOST: '"wss://wx.fangdeal.cn"',
6
+    // HOST: '"https://dev.fangdeal.cn"', //测试
7
+    // WSS_HOST: '"wss://dev.fangdeal.cn"',
8
+    HOST: '"https://wx.fangdeal.cn"', //正式
9
+    WSS_HOST: '"wss://wx.fangdeal.cn"',
10
     OSS_PATH: "https://njcj.oss-cn-shanghai.aliyuncs.com/",
10
     OSS_PATH: "https://njcj.oss-cn-shanghai.aliyuncs.com/",
11
     OSS_FAST_PATH: "https://njcj.oss-accelerate.aliyuncs.com/",
11
     OSS_FAST_PATH: "https://njcj.oss-accelerate.aliyuncs.com/",
12
     Version: "V3.5.28"
12
     Version: "V3.5.28"

+ 1
- 1
project.config.json 查看文件

2
 	"miniprogramRoot": "dist/",
2
 	"miniprogramRoot": "dist/",
3
 	"projectname": "mini-chengjiao",
3
 	"projectname": "mini-chengjiao",
4
 	"description": "知与行互动",
4
 	"description": "知与行互动",
5
-	"appid": "wxd9ee3a9480a4e544",
5
+	"appid": "wxd6f47a9bb3052175",
6
 	"setting": {
6
 	"setting": {
7
 		"urlCheck": false,
7
 		"urlCheck": false,
8
 		"es6": false,
8
 		"es6": false,

+ 1
- 1
src/components/Poster/index.js 查看文件

118
               {
118
               {
119
                 done && images.map((img, inx) => {
119
                 done && images.map((img, inx) => {
120
                   return (
120
                   return (
121
-                    <SwiperItem key={`img-${inx}`} style=" text-align: center;">
121
+                    <SwiperItem key={`img-${inx}`} style=" text-align: center; display: flex;">
122
                       <Image className="result-img" mode="aspectFit" lazy-load src={img} onClick={this.onPreview}></Image>
122
                       <Image className="result-img" mode="aspectFit" lazy-load src={img} onClick={this.onPreview}></Image>
123
                     </SwiperItem>
123
                     </SwiperItem>
124
                   )
124
                   )

+ 1
- 1
src/pages/activity/detail/poster.scss 查看文件

43
       border-radius: 10px;
43
       border-radius: 10px;
44
       padding: 40px 0;
44
       padding: 40px 0;
45
       text-align: center;
45
       text-align: center;
46
-
46
+      display: flex;
47
       .result-img {
47
       .result-img {
48
         height: 60vh;
48
         height: 60vh;
49
         display: block;
49
         display: block;

+ 20
- 19
src/pages/card/index.js 查看文件

77
       const { dispatchCardInfo, dispatchProjectDetail } = this.props;
77
       const { dispatchCardInfo, dispatchProjectDetail } = this.props;
78
       Taro.showLoading();
78
       Taro.showLoading();
79
       dispatchCardInfo(cardId, { ...queryInfo }).then(res => {
79
       dispatchCardInfo(cardId, { ...queryInfo }).then(res => {
80
-        Taro.hideLoading();
81
         this.setState({
80
         this.setState({
82
           loaded: true,
81
           loaded: true,
83
           isSave: res.isSave
82
           isSave: res.isSave
91
         this.setState({
90
         this.setState({
92
           posterData
91
           posterData
93
         });
92
         });
93
+        Taro.hideLoading();
94
       });
94
       });
95
     }
95
     }
96
   }
96
   }
252
 
252
 
253
     Taro.getLocation({
253
     Taro.getLocation({
254
       //返回可以用于Taro.openLocation的经纬度,官方提示bug: iOS 6.3.30 type 参数不生效,只会返回 wgs84 类型的坐标信息
254
       //返回可以用于Taro.openLocation的经纬度,官方提示bug: iOS 6.3.30 type 参数不生效,只会返回 wgs84 类型的坐标信息
255
-      success: function(res) {
255
+      success: function (res) {
256
         Taro.openLocation({
256
         Taro.openLocation({
257
           latitude,
257
           latitude,
258
           longitude,
258
           longitude,
631
   // 选择图片
631
   // 选择图片
632
   bindAlbumClick(e) {
632
   bindAlbumClick(e) {
633
     e.stopPropagation();
633
     e.stopPropagation();
634
+    const { userInfo: { person: { personId } } } = this.props;
634
     Taro.chooseImage({
635
     Taro.chooseImage({
635
       count: 1,
636
       count: 1,
636
       sizeType: ["original", "compressed"], //可选择原图或压缩后的图片
637
       sizeType: ["original", "compressed"], //可选择原图或压缩后的图片
641
             url: `/pages/card/photo?photoUrl=${encodeURIComponent(data[0])}`
642
             url: `/pages/card/photo?photoUrl=${encodeURIComponent(data[0])}`
642
           });
643
           });
643
         });
644
         });
644
-      }
645
+      },
645
     });
646
     });
646
   }
647
   }
647
 
648
 
766
                         )}
767
                         )}
767
                       </View>
768
                       </View>
768
                     ) : (
769
                     ) : (
769
-                      <Button
770
-                        className="clear-btn"
771
-                        open-type="getPhoneNumber"
772
-                        onGetphonenumber={this.getPhoneNumber}
773
-                      >
774
-                        <Image
775
-                          src={require("@/assets/person/zixun.png")}
776
-                          className="chat-img"
777
-                        ></Image>
778
-                        {unReadNum > 0 && (
779
-                          <Text className="unread-num">{unReadNum}</Text>
780
-                        )}
781
-                      </Button>
782
-                    ))}
770
+                        <Button
771
+                          className="clear-btn"
772
+                          open-type="getPhoneNumber"
773
+                          onGetphonenumber={this.getPhoneNumber}
774
+                        >
775
+                          <Image
776
+                            src={require("@/assets/person/zixun.png")}
777
+                            className="chat-img"
778
+                          ></Image>
779
+                          {unReadNum > 0 && (
780
+                            <Text className="unread-num">{unReadNum}</Text>
781
+                          )}
782
+                        </Button>
783
+                      ))}
783
                 </View>
784
                 </View>
784
                 <View className="row medal">
785
                 <View className="row medal">
785
                   <Image
786
                   <Image
865
                   <View className="detailed__tel" onClick={this.makePhoneCall}>
866
                   <View className="detailed__tel" onClick={this.makePhoneCall}>
866
                     <View className="detailed__tel__txt">
867
                     <View className="detailed__tel__txt">
867
                       <Text className="tel__txt" space="emsp">
868
                       <Text className="tel__txt" space="emsp">
868
-                        手机 
869
+                        手机
869
                       </Text>{" "}
870
                       </Text>{" "}
870
                       {cardInfo.phone}
871
                       {cardInfo.phone}
871
                     </View>
872
                     </View>
874
                   <View className="detailed__add" onClick={this.getLocation}>
875
                   <View className="detailed__add" onClick={this.getLocation}>
875
                     <View className="detailed__add__txt">
876
                     <View className="detailed__add__txt">
876
                       <Text className="add__txt" space="emsp">
877
                       <Text className="add__txt" space="emsp">
877
-                        地址 
878
+                        地址
878
                       </Text>{" "}
879
                       </Text>{" "}
879
                       {address}
880
                       {address}
880
                     </View>
881
                     </View>

+ 1
- 0
src/pages/card/poster.scss 查看文件

43
       border-radius: 10px;
43
       border-radius: 10px;
44
       padding: 40px 0;
44
       padding: 40px 0;
45
       text-align: center;
45
       text-align: center;
46
+      display: flex;
46
       .result-img {
47
       .result-img {
47
         height: 60vh;
48
         height: 60vh;
48
         display: block;
49
         display: block;

+ 1
- 1
src/pages/news/detail/index.js 查看文件

274
         console.info('资讯详情')
274
         console.info('资讯详情')
275
       })
275
       })
276
       if (res.buildingId) {
276
       if (res.buildingId) {
277
-        dispatchProjectDetail(res.buildingId, { showToast: false, })
277
+        dispatchProjectDetail(res.buildingId, undefined, { showToast: false, })
278
       }
278
       }
279
 
279
 
280
       this.setState({
280
       this.setState({

+ 1
- 1
src/pages/news/detail/poster.js 查看文件

265
                   <Text>保存后分享图片</Text>
265
                   <Text>保存后分享图片</Text>
266
                   <Text className="iconfont icon-buoumaotubiao20" onClick={this.onCancel}></Text>
266
                   <Text className="iconfont icon-buoumaotubiao20" onClick={this.onCancel}></Text>
267
                 </View>
267
                 </View>
268
-                <View className="con-body">
268
+                <View className="con-body" style="display: flex;">
269
                   <Image className="result-img" mode="aspectFit" lazy-load src={this.state.shareImage} onClick={this.onPreview}></Image>
269
                   <Image className="result-img" mode="aspectFit" lazy-load src={this.state.shareImage} onClick={this.onPreview}></Image>
270
                 </View>
270
                 </View>
271
                 <Button className="save-btn" onClick={this.saveToAlbum}>保存海报</Button>
271
                 <Button className="save-btn" onClick={this.saveToAlbum}>保存海报</Button>

+ 1
- 1
src/pages/project/detail/poster.scss 查看文件

42
       // background: #EAEAEA;
42
       // background: #EAEAEA;
43
       border-radius: 10px;
43
       border-radius: 10px;
44
       padding: 40px 0;
44
       padding: 40px 0;
45
-
45
+      display: flex;
46
       .result-img {
46
       .result-img {
47
         height: 720.65px;
47
         height: 720.65px;
48
         // height: 60vh;
48
         // height: 60vh;