Merge branch 'V6.8.6' into 'master'

V6.8.6

V6.8.6 发布

See merge request !27

@@ -51,7 +51,7 @@ export default class GroupPurchaseDetail extends Component {
             // let info = infoData?infoData.toJS():'';
             // let item = info[0];
             // let src = YH_Image.getSlicedUrl(item.src, width, 70, 2);
-            let src = 'http://img13.static.yhbimg.com/article/2018/07/18/10/02de2e27168c47ef13209f74b2cfc0cab4.png';
+            let src = 'http://img13.static.yhbimg.com/article/2019/02/28/14/02b72ac74385bdefd089ffa860d29d0862.jpeg';
 
               return(
                 <View style={{width:width, height:70*DEVICE_WIDTH_RATIO+8, backgroundColor:'#f0f0f0'}}>

@@ -98,7 +98,7 @@ class GroupPurchaseContainer extends Component {
     }
 
     shareSnapshootAction(shareType,url) {
-        let fromPage = 'GroupPurchaseDetail';
+        let fromPage = 'GroupPurchase';
         let param = {
           shareType,
           imageUrl: url,
@@ -123,7 +123,13 @@ class GroupPurchaseContainer extends Component {
         if (!resource) {
           return;
         }
-        let miniProgramPath = '/pages/group/list?activityId=' + activityId;
+
+        let miniProgramPath;
+        if (!activityId) {
+          miniProgramPath = '/pages/group/list';
+        } else {
+           miniProgramPath = '/pages/group/list?activityId=' + activityId;
+        }
         miniProgramPath = Helper.joinWxProgramPath(miniProgramPath, groupListParams)
         
         let fromPage = 'GroupPurchase';

@@ -15,16 +15,29 @@ export default class groupPurchaseService {
 
     async fetchGroupProductList(activityId, page=1, limit=20, fromPage, listParams) {
 
+        let bodyParam;
+        if (!activityId) {
+          bodyParam = {
+              method: 'app.collage.productList.page',
+              ...listParams,
+              page,
+              limit,
+              fromPage,
+          };
+        } else {
+          bodyParam = {
+              method: 'app.collage.productList.page',
+              ...listParams,
+              page,
+              limit,
+              activityId,
+              fromPage,
+          };
+        }
+
         return await this.api.get({
             url: '',
-            body: {
-                method: 'app.collage.productList.page',
-                ...listParams,
-                page,
-        		limit,
-                activityId,
-                fromPage,
-            }
+            body: bodyParam
         })
         .then((json) => {
             return json;
@@ -34,7 +47,7 @@ export default class groupPurchaseService {
         });
     }
 
-    
+
     async fetchGroupDetailProductList(activityId,page=1, limit=20,fromPage) {
         return await this.api.get({
             url: '',

@@ -32,8 +32,16 @@ function excludeParams(groupParams, needGender=true){
 
 function joinWxProgramPath(wxPath, groupParams){
     let params = excludeParams(groupParams, false);
+
+    let paramStr = "";
     for(let key in params){
-        wxPath = wxPath + "&" + key + "=" + params[key];
+        paramStr = paramStr + "&" + key + "=" + params[key];
+    }
+
+    if(wxPath.indexOf("?") != -1){
+        wxPath = wxPath + paramStr;
+    }else{
+        wxPath = wxPath + "?" + paramStr.substring(1);
     }
     return wxPath;
 }

@@ -32,8 +32,8 @@ export default class Message extends Component {
     componentDidMount() {
           this.viewDidAppear = DeviceEventEmitter.addListener(
             'VCDidAppear',
-            () => {                
-                 this.trigggePullToRefresh();
+            () => {
+                this.trigggePullToRefresh();
             }
         );
 

@@ -90,7 +90,7 @@ export function messageList() {
 			return new MessageListService(app.host).fetchMessageList(page,pageSize,sourcePage,list.listId)
 				.then(json => {
 					let payload = parseMessageList(json);
-					payload.endReached = (payload.currentPage == payload.pageCount) && (payload.pageCount != 1);
+					payload.endReached = payload.currentPage >= payload.pageCount;
 
 					if (payload.currentPage > 1) {
 						let oldList = list.list.toJS();